Skip to content

Commit acf2981

Browse files
author
Bartosz Golaszewski
committed
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: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
1 parent b679d6c commit acf2981

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

drivers/gpio/gpio-aspeed.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -973,7 +973,7 @@ static int aspeed_gpio_set_config(struct gpio_chip *chip, unsigned int offset,
973973
else if (param == PIN_CONFIG_BIAS_DISABLE ||
974974
param == PIN_CONFIG_BIAS_PULL_DOWN ||
975975
param == PIN_CONFIG_DRIVE_STRENGTH)
976-
return pinctrl_gpio_set_config_new(chip, offset, config);
976+
return pinctrl_gpio_set_config(chip, offset, config);
977977
else if (param == PIN_CONFIG_DRIVE_OPEN_DRAIN ||
978978
param == PIN_CONFIG_DRIVE_OPEN_SOURCE)
979979
/* Return -ENOTSUPP to trigger emulation, as per datasheet */

drivers/gpio/gpiolib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2043,7 +2043,7 @@ EXPORT_SYMBOL_GPL(gpiochip_generic_free);
20432043
int gpiochip_generic_config(struct gpio_chip *gc, unsigned int offset,
20442044
unsigned long config)
20452045
{
2046-
return pinctrl_gpio_set_config_new(gc, offset, config);
2046+
return pinctrl_gpio_set_config(gc, offset, config);
20472047
}
20482048
EXPORT_SYMBOL_GPL(gpiochip_generic_config);
20492049

drivers/pinctrl/core.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ int pinctrl_gpio_direction_output(struct gpio_chip *gc, unsigned int offset)
904904
EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output);
905905

906906
/**
907-
* pinctrl_gpio_set_config_new() - Apply config to given GPIO pin
907+
* pinctrl_gpio_set_config() - Apply config to given GPIO pin
908908
* @gc: GPIO chip structure from the GPIO subsystem
909909
* @offset: hardware offset of the GPIO relative to the controller
910910
* @config: the configuration to apply to the GPIO
@@ -913,7 +913,7 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output);
913913
* they need to call the underlying pin controller to change GPIO config
914914
* (for example set debounce time).
915915
*/
916-
int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset,
916+
int pinctrl_gpio_set_config(struct gpio_chip *gc, unsigned int offset,
917917
unsigned long config)
918918
{
919919
unsigned long configs[] = { config };
@@ -933,7 +933,7 @@ int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset,
933933

934934
return ret;
935935
}
936-
EXPORT_SYMBOL_GPL(pinctrl_gpio_set_config_new);
936+
EXPORT_SYMBOL_GPL(pinctrl_gpio_set_config);
937937

938938
static struct pinctrl_state *find_state(struct pinctrl *p,
939939
const char *name)

include/linux/pinctrl/consumer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ int pinctrl_gpio_direction_input(struct gpio_chip *gc,
3333
unsigned int offset);
3434
int pinctrl_gpio_direction_output(struct gpio_chip *gc,
3535
unsigned int offset);
36-
int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset,
36+
int pinctrl_gpio_set_config(struct gpio_chip *gc, unsigned int offset,
3737
unsigned long config);
3838

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

9999
static inline int
100-
pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset,
100+
pinctrl_gpio_set_config(struct gpio_chip *gc, unsigned int offset,
101101
unsigned long config)
102102
{
103103
return 0;

0 commit comments

Comments
 (0)