From 9d6cb1cf0c094c6050a76b5cd4ec06ae8b79e501 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 15 Dec 2012 23:50:50 +0100 Subject: [PATCH] --- yaml --- r: 355344 b: refs/heads/master c: 4a2e0d18f95e1ec2b264f66e7cedec7f3dc54b44 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/sh/pfc/pinctrl.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6650a28454a6..77e7de511dc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9fa88e23a8c6d1a72ba37c7d4df3d05051e8e8e +refs/heads/master: 4a2e0d18f95e1ec2b264f66e7cedec7f3dc54b44 diff --git a/trunk/drivers/sh/pfc/pinctrl.c b/trunk/drivers/sh/pfc/pinctrl.c index b3dbefd5658b..47dbd0231096 100644 --- a/trunk/drivers/sh/pfc/pinctrl.c +++ b/trunk/drivers/sh/pfc/pinctrl.c @@ -116,7 +116,7 @@ static void sh_pfc_noop_disable(struct pinctrl_dev *pctldev, unsigned func, { } -static inline int sh_pfc_config_function(struct sh_pfc *pfc, unsigned offset) +static int sh_pfc_config_function(struct sh_pfc *pfc, unsigned offset) { if (sh_pfc_config_gpio(pfc, offset, PINMUX_TYPE_FUNCTION, @@ -328,10 +328,8 @@ static struct pinctrl_desc sh_pfc_pinctrl_desc = { .confops = &sh_pfc_pinconf_ops, }; -static inline void sh_pfc_map_one_gpio(struct sh_pfc *pfc, - struct sh_pfc_pinctrl *pmx, - struct pinmux_gpio *gpio, - unsigned offset) +static void sh_pfc_map_one_gpio(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx, + struct pinmux_gpio *gpio, unsigned offset) { struct pinmux_data_reg *dummy; unsigned long flags;