pinctrl: fix incorrect inline keyword in multiple drivers
authorArnd Bergmann <arnd@arndb.de>
Mon, 13 Jun 2016 15:18:34 +0000 (17:18 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 15 Jun 2016 06:37:41 +0000 (08:37 +0200)
When building with 'make W=1', we get harmless warnings about
five drivers in drivers/pinctrl, which all contain a copy of
the same line:

drivers/pinctrl/freescale/pinctrl-imx1-core.c:160:1: error: 'inline' is not at beginning of declaration [-Werror=old-style-declaration]

This replaces the somewhat nonstandard 'static const inline'
with 'static inline const', which has the same meaning but
does not cause this warning.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/freescale/pinctrl-imx.c
drivers/pinctrl/freescale/pinctrl-imx1-core.c
drivers/pinctrl/pinctrl-at91.c
drivers/pinctrl/pinctrl-rockchip.c
drivers/pinctrl/pinctrl-st.c

index be19a1b..0dddbb3 100644 (file)
@@ -46,7 +46,7 @@ struct imx_pinctrl {
        const struct imx_pinctrl_soc_info *info;
 };
 
-static const inline struct imx_pin_group *imx_pinctrl_find_group_by_name(
+static inline const struct imx_pin_group *imx_pinctrl_find_group_by_name(
                                const struct imx_pinctrl_soc_info *info,
                                const char *name)
 {
index b4400cb..38d3938 100644 (file)
@@ -157,7 +157,7 @@ static int imx1_read_bit(struct imx1_pinctrl *ipctl, unsigned int pin_id,
        return !!(readl(reg) & BIT(offset));
 }
 
-static const inline struct imx1_pin_group *imx1_pinctrl_find_group_by_name(
+static inline const struct imx1_pin_group *imx1_pinctrl_find_group_by_name(
                                const struct imx1_pinctrl_soc_info *info,
                                const char *name)
 {
index cb9a084..80daead 100644 (file)
@@ -188,7 +188,7 @@ struct at91_pinctrl {
        struct at91_pinctrl_mux_ops *ops;
 };
 
-static const inline struct at91_pin_group *at91_pinctrl_find_group_by_name(
+static inline const struct at91_pin_group *at91_pinctrl_find_group_by_name(
                                const struct at91_pinctrl *info,
                                const char *name)
 {
index a91026e..a2337b7 100644 (file)
@@ -360,7 +360,7 @@ static struct regmap_config rockchip_regmap_config = {
        .reg_stride = 4,
 };
 
-static const inline struct rockchip_pin_group *pinctrl_name_to_group(
+static inline const struct rockchip_pin_group *pinctrl_name_to_group(
                                        const struct rockchip_pinctrl *info,
                                        const char *name)
 {
index d0ba968..0de1c67 100644 (file)
@@ -844,7 +844,7 @@ static int st_pctl_get_group_pins(struct pinctrl_dev *pctldev,
        return 0;
 }
 
-static const inline struct st_pctl_group *st_pctl_find_group_by_name(
+static inline const struct st_pctl_group *st_pctl_find_group_by_name(
        const struct st_pinctrl *info, const char *name)
 {
        int i;