Commit 699f0784 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

pinctrl: remove pinctrl_gpio_request() 



There are no more users of pinctrl_gpio_request() so remove it.

Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a063e57a

drivers/pinctrl/core.c

+17 −24
Original line number Diff line number Diff line
@@ -783,17 +783,25 @@ bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset) 
}

EXPORT_SYMBOL_GPL(pinctrl_gpio_can_use_line_new);



/* This function is deprecated and will be removed. Don't use. */

int pinctrl_gpio_request(unsigned gpio)

/**

 * pinctrl_gpio_request_new() - request a single pin to be used as GPIO

 * @gc: GPIO chip structure from the GPIO subsystem

 * @offset: hardware offset of the GPIO relative to the controller

 *

 * This function should *ONLY* be used from gpiolib-based GPIO drivers,

 * as part of their gpio_request() semantics, platforms and individual drivers

 * shall *NOT* request GPIO pins to be muxed in.

 */

int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset)

{

	struct pinctrl_dev *pctldev;

	struct pinctrl_gpio_range *range;

	int ret;

	int pin;

	struct pinctrl_dev *pctldev;

	int ret, pin;



	ret = pinctrl_get_device_gpio_range(gpio, &pctldev, &range);

	ret = pinctrl_get_device_gpio_range(gc->base + offset, &pctldev,

					    &range);

	if (ret) {

		if (pinctrl_ready_for_gpio_range(gpio))

		if (pinctrl_ready_for_gpio_range(gc->base + offset))

			ret = 0;

		return ret;

	}
@@ -801,29 +809,14 @@ int pinctrl_gpio_request(unsigned gpio) 
	mutex_lock(&pctldev->mutex);



	/* Convert to the pin controllers number space */

	pin = gpio_to_pin(range, gpio);

	pin = gpio_to_pin(range, gc->base + offset);



	ret = pinmux_request_gpio(pctldev, range, pin, gpio);

	ret = pinmux_request_gpio(pctldev, range, pin, gc->base + offset);



	mutex_unlock(&pctldev->mutex);



	return ret;

}

EXPORT_SYMBOL_GPL(pinctrl_gpio_request);



/**

 * pinctrl_gpio_request_new() - request a single pin to be used as GPIO

 * @gc: GPIO chip structure from the GPIO subsystem

 * @offset: hardware offset of the GPIO relative to the controller

 *

 * This function should *ONLY* be used from gpiolib-based GPIO drivers,

 * as part of their gpio_request() semantics, platforms and individual drivers

 * shall *NOT* request GPIO pins to be muxed in.

 */

int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset)

{

	return pinctrl_gpio_request(gc->base + offset);

}

EXPORT_SYMBOL_GPL(pinctrl_gpio_request_new);



/* This function is deprecated and will be removed. Don't use. */

include/linux/pinctrl/consumer.h

+0 −6
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ struct pinctrl_state; 


/* External interface to pin control */

bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset);

int pinctrl_gpio_request(unsigned gpio);

int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset);

void pinctrl_gpio_free(unsigned gpio);

void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset);
@@ -78,11 +77,6 @@ pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset) 
	return true;

}



static inline int pinctrl_gpio_request(unsigned gpio)

{

	return 0;

}



static inline int

pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset)

{