Commit acf2981b authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

treewide: rename pinctrl_gpio_set_config_new() 



Now that pinctrl_gpio_set_config() is no longer used, let's drop the
'_new' suffix from its improved variant.

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

drivers/gpio/gpio-aspeed.c

+1 −1
Original line number Diff line number Diff line
@@ -973,7 +973,7 @@ static int aspeed_gpio_set_config(struct gpio_chip *chip, unsigned int offset, 
	else if (param == PIN_CONFIG_BIAS_DISABLE ||

			param == PIN_CONFIG_BIAS_PULL_DOWN ||

			param == PIN_CONFIG_DRIVE_STRENGTH)

		return pinctrl_gpio_set_config_new(chip, offset, config);

		return pinctrl_gpio_set_config(chip, offset, config);

	else if (param == PIN_CONFIG_DRIVE_OPEN_DRAIN ||

			param == PIN_CONFIG_DRIVE_OPEN_SOURCE)

		/* Return -ENOTSUPP to trigger emulation, as per datasheet */

drivers/gpio/gpiolib.c

+1 −1
Original line number Diff line number Diff line
@@ -2043,7 +2043,7 @@ EXPORT_SYMBOL_GPL(gpiochip_generic_free); 
int gpiochip_generic_config(struct gpio_chip *gc, unsigned int offset,

			    unsigned long config)

{

	return pinctrl_gpio_set_config_new(gc, offset, config);

	return pinctrl_gpio_set_config(gc, offset, config);

}

EXPORT_SYMBOL_GPL(gpiochip_generic_config);

drivers/pinctrl/core.c

+3 −3
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ int pinctrl_gpio_direction_output(struct gpio_chip *gc, unsigned int offset) 
EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output);



/**

 * pinctrl_gpio_set_config_new() - Apply config to given GPIO pin

 * pinctrl_gpio_set_config() - Apply config to given GPIO pin

 * @gc: GPIO chip structure from the GPIO subsystem

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

 * @config: the configuration to apply to the GPIO
@@ -913,7 +913,7 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output); 
 * they need to call the underlying pin controller to change GPIO config

 * (for example set debounce time).

 */

int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset,

int pinctrl_gpio_set_config(struct gpio_chip *gc, unsigned int offset,

				unsigned long config)

{

	unsigned long configs[] = { config };
@@ -933,7 +933,7 @@ int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, 


	return ret;

}

EXPORT_SYMBOL_GPL(pinctrl_gpio_set_config_new);

EXPORT_SYMBOL_GPL(pinctrl_gpio_set_config);



static struct pinctrl_state *find_state(struct pinctrl *p,

					const char *name)

include/linux/pinctrl/consumer.h

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ int pinctrl_gpio_direction_input(struct gpio_chip *gc, 
				 unsigned int offset);

int pinctrl_gpio_direction_output(struct gpio_chip *gc,

				  unsigned int offset);

int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset,

int pinctrl_gpio_set_config(struct gpio_chip *gc, unsigned int offset,

				unsigned long config);



struct pinctrl * __must_check pinctrl_get(struct device *dev);
@@ -97,7 +97,7 @@ pinctrl_gpio_direction_output(struct gpio_chip *gc, unsigned int offset) 
}



static inline int

pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset,

pinctrl_gpio_set_config(struct gpio_chip *gc, unsigned int offset,

			    unsigned long config)

{

	return 0;