Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56411f3c authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Walleij
Browse files

pinctrl: fix incorrect inline keyword in multiple drivers 



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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 648eb7a1

drivers/pinctrl/freescale/pinctrl-imx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ struct imx_pinctrl { 
	const struct imx_pinctrl_soc_info *info;

	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 struct imx_pinctrl_soc_info *info,

				const char *name)

				const char *name)

{

{

drivers/pinctrl/freescale/pinctrl-imx1-core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -157,7 +157,7 @@ static int imx1_read_bit(struct imx1_pinctrl *ipctl, unsigned int pin_id, 
	return !!(readl(reg) & BIT(offset));

	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 struct imx1_pinctrl_soc_info *info,

				const char *name)

				const char *name)

{

{

drivers/pinctrl/pinctrl-at91.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -188,7 +188,7 @@ struct at91_pinctrl { 
	struct at91_pinctrl_mux_ops *ops;

	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 struct at91_pinctrl *info,

				const char *name)

				const char *name)

{

{

drivers/pinctrl/pinctrl-rockchip.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -360,7 +360,7 @@ static struct regmap_config rockchip_regmap_config = { 
	.reg_stride = 4,

	.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 struct rockchip_pinctrl *info,

					const char *name)

					const char *name)

{

{

drivers/pinctrl/pinctrl-st.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -844,7 +844,7 @@ static int st_pctl_get_group_pins(struct pinctrl_dev *pctldev, 
	return 0;

	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)

	const struct st_pinctrl *info, const char *name)

{

{

	int i;

	int i;