diff options
| author | Linus Walleij <[email protected]> | 2017-10-07 12:29:14 +0200 |
|---|---|---|
| committer | Linus Walleij <[email protected]> | 2017-10-07 12:29:14 +0200 |
| commit | 2dca9227d356f77d1f6372db213e0446c972a79d (patch) | |
| tree | 2d846d70def6e6a0ad774b34972fa12d87862d9d /include/linux | |
| parent | 027c87fe69599598c6d396b971d2cd9ef45e002e (diff) | |
| parent | ad5c32218879c4b23638488989503d7444822ef2 (diff) | |
Merge branch 'pinconf-rename' into devel
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pinctrl/consumer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h index a0f2aba72fa9..0412cc9833e9 100644 --- a/include/linux/pinctrl/consumer.h +++ b/include/linux/pinctrl/consumer.h @@ -25,8 +25,8 @@ struct device; #ifdef CONFIG_PINCTRL /* External interface to pin control */ -extern int pinctrl_request_gpio(unsigned gpio); -extern void pinctrl_free_gpio(unsigned gpio); +extern int pinctrl_gpio_request(unsigned gpio); +extern void pinctrl_gpio_free(unsigned gpio); extern int pinctrl_gpio_direction_input(unsigned gpio); extern int pinctrl_gpio_direction_output(unsigned gpio); extern int pinctrl_gpio_set_config(unsigned gpio, unsigned long config); @@ -62,12 +62,12 @@ static inline int pinctrl_pm_select_idle_state(struct device *dev) #else /* !CONFIG_PINCTRL */ -static inline int pinctrl_request_gpio(unsigned gpio) +static inline int pinctrl_gpio_request(unsigned gpio) { return 0; } -static inline void pinctrl_free_gpio(unsigned gpio) +static inline void pinctrl_gpio_free(unsigned gpio) { } |