diff options
Diffstat (limited to 'drivers/sh/pfc/pinctrl.c')
-rw-r--r-- | drivers/sh/pfc/pinctrl.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/sh/pfc/pinctrl.c b/drivers/sh/pfc/pinctrl.c index b3dbefd5658b..47dbd0231096 100644 --- a/drivers/sh/pfc/pinctrl.c +++ b/drivers/sh/pfc/pinctrl.c | |||
@@ -116,7 +116,7 @@ static void sh_pfc_noop_disable(struct pinctrl_dev *pctldev, unsigned func, | |||
116 | { | 116 | { |
117 | } | 117 | } |
118 | 118 | ||
119 | static inline int sh_pfc_config_function(struct sh_pfc *pfc, unsigned offset) | 119 | static int sh_pfc_config_function(struct sh_pfc *pfc, unsigned offset) |
120 | { | 120 | { |
121 | if (sh_pfc_config_gpio(pfc, offset, | 121 | if (sh_pfc_config_gpio(pfc, offset, |
122 | PINMUX_TYPE_FUNCTION, | 122 | PINMUX_TYPE_FUNCTION, |
@@ -328,10 +328,8 @@ static struct pinctrl_desc sh_pfc_pinctrl_desc = { | |||
328 | .confops = &sh_pfc_pinconf_ops, | 328 | .confops = &sh_pfc_pinconf_ops, |
329 | }; | 329 | }; |
330 | 330 | ||
331 | static inline void sh_pfc_map_one_gpio(struct sh_pfc *pfc, | 331 | static void sh_pfc_map_one_gpio(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx, |
332 | struct sh_pfc_pinctrl *pmx, | 332 | struct pinmux_gpio *gpio, unsigned offset) |
333 | struct pinmux_gpio *gpio, | ||
334 | unsigned offset) | ||
335 | { | 333 | { |
336 | struct pinmux_data_reg *dummy; | 334 | struct pinmux_data_reg *dummy; |
337 | unsigned long flags; | 335 | unsigned long flags; |