Commit 1d2c8845 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

pinctrl: remove pinctrl_gpio_free() 



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

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

drivers/pinctrl/core.c

+17 −24
Original line number Diff line number Diff line
@@ -819,29 +819,6 @@ int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset) 
}

EXPORT_SYMBOL_GPL(pinctrl_gpio_request_new);



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

void pinctrl_gpio_free(unsigned gpio)

{

	struct pinctrl_dev *pctldev;

	struct pinctrl_gpio_range *range;

	int ret;

	int pin;



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

	if (ret) {

		return;

	}

	mutex_lock(&pctldev->mutex);



	/* Convert to the pin controllers number space */

	pin = gpio_to_pin(range, gpio);



	pinmux_free_gpio(pctldev, pin, range);



	mutex_unlock(&pctldev->mutex);

}

EXPORT_SYMBOL_GPL(pinctrl_gpio_free);



/**

 * pinctrl_gpio_free_new() - free control on a single pin, currently used as GPIO

 * @gc: GPIO chip structure from the GPIO subsystem
@@ -853,7 +830,23 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_free); 
 */

void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset)

{

	return pinctrl_gpio_free(gc->base + offset);

	struct pinctrl_gpio_range *range;

	struct pinctrl_dev *pctldev;

	int ret, pin;



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

					    &range);

	if (ret)

		return;



	mutex_lock(&pctldev->mutex);



	/* Convert to the pin controllers number space */

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



	pinmux_free_gpio(pctldev, pin, range);



	mutex_unlock(&pctldev->mutex);

}

EXPORT_SYMBOL_GPL(pinctrl_gpio_free_new);

include/linux/pinctrl/consumer.h

+0 −5
Original line number Diff line number Diff line
@@ -28,7 +28,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_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);

int pinctrl_gpio_direction_input(unsigned gpio);

int pinctrl_gpio_direction_input_new(struct gpio_chip *gc,
@@ -83,10 +82,6 @@ pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset) 
	return 0;

}



static inline void pinctrl_gpio_free(unsigned gpio)

{

}



static inline void

pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset)

{