diff options
| -rw-r--r-- | drivers/gpio/gpiolib.c | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/core.c | 4 | ||||
| -rw-r--r-- | include/linux/pinctrl/pinctrl.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 6d13bea4778a..a59d13d746c5 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c | |||
| @@ -1216,7 +1216,7 @@ int gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name, | |||
| 1216 | pin_range->range.base = chip->base + offset; | 1216 | pin_range->range.base = chip->base + offset; |
| 1217 | pin_range->range.pin_base = pin_base; | 1217 | pin_range->range.pin_base = pin_base; |
| 1218 | pin_range->range.npins = npins; | 1218 | pin_range->range.npins = npins; |
| 1219 | pin_range->pctldev = find_pinctrl_and_add_gpio_range(pinctl_name, | 1219 | pin_range->pctldev = pinctrl_find_and_add_gpio_range(pinctl_name, |
| 1220 | &pin_range->range); | 1220 | &pin_range->range); |
| 1221 | if (!pin_range->pctldev) { | 1221 | if (!pin_range->pctldev) { |
| 1222 | pr_err("%s: GPIO chip: could not create pin range\n", | 1222 | pr_err("%s: GPIO chip: could not create pin range\n", |
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 71db586b2afd..15f5ac864f14 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c | |||
| @@ -345,7 +345,7 @@ void pinctrl_add_gpio_ranges(struct pinctrl_dev *pctldev, | |||
| 345 | } | 345 | } |
| 346 | EXPORT_SYMBOL_GPL(pinctrl_add_gpio_ranges); | 346 | EXPORT_SYMBOL_GPL(pinctrl_add_gpio_ranges); |
| 347 | 347 | ||
| 348 | struct pinctrl_dev *find_pinctrl_and_add_gpio_range(const char *devname, | 348 | struct pinctrl_dev *pinctrl_find_and_add_gpio_range(const char *devname, |
| 349 | struct pinctrl_gpio_range *range) | 349 | struct pinctrl_gpio_range *range) |
| 350 | { | 350 | { |
| 351 | struct pinctrl_dev *pctldev = get_pinctrl_dev_from_devname(devname); | 351 | struct pinctrl_dev *pctldev = get_pinctrl_dev_from_devname(devname); |
| @@ -356,7 +356,7 @@ struct pinctrl_dev *find_pinctrl_and_add_gpio_range(const char *devname, | |||
| 356 | pinctrl_add_gpio_range(pctldev, range); | 356 | pinctrl_add_gpio_range(pctldev, range); |
| 357 | return pctldev; | 357 | return pctldev; |
| 358 | } | 358 | } |
| 359 | EXPORT_SYMBOL_GPL(find_pinctrl_and_add_gpio_range); | 359 | EXPORT_SYMBOL_GPL(pinctrl_find_and_add_gpio_range); |
| 360 | 360 | ||
| 361 | /** | 361 | /** |
| 362 | * pinctrl_remove_gpio_range() - remove a range of GPIOs fro a pin controller | 362 | * pinctrl_remove_gpio_range() - remove a range of GPIOs fro a pin controller |
diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h index 4a58428bc793..7dee9acbd271 100644 --- a/include/linux/pinctrl/pinctrl.h +++ b/include/linux/pinctrl/pinctrl.h | |||
| @@ -137,7 +137,7 @@ extern void pinctrl_add_gpio_ranges(struct pinctrl_dev *pctldev, | |||
| 137 | extern void pinctrl_remove_gpio_range(struct pinctrl_dev *pctldev, | 137 | extern void pinctrl_remove_gpio_range(struct pinctrl_dev *pctldev, |
| 138 | struct pinctrl_gpio_range *range); | 138 | struct pinctrl_gpio_range *range); |
| 139 | 139 | ||
| 140 | extern struct pinctrl_dev *find_pinctrl_and_add_gpio_range(const char *devname, | 140 | extern struct pinctrl_dev *pinctrl_find_and_add_gpio_range(const char *devname, |
| 141 | struct pinctrl_gpio_range *range); | 141 | struct pinctrl_gpio_range *range); |
| 142 | 142 | ||
| 143 | #ifdef CONFIG_OF | 143 | #ifdef CONFIG_OF |
