Message ID | 20190425095542.726-3-geert+renesas@glider.be |
---|---|
State | New |
Headers | show |
Series | pinctrl: sh-pfc: Run-time debug code fixes and enhancements | expand |
On Thu, Apr 25, 2019 at 11:55:40AM +0200, Geert Uytterhoeven wrote: > All run-time debug code is called from sh_pfc_init(), which is __init. > > Fixes: 6161b39a14380815 ("pinctrl: sh-pfc: Validate pinmux tables at runtime when debugging") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Simon Horman <horms+renesas@verge.net.au> > --- > drivers/pinctrl/sh-pfc/core.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c > index 18d7f6d9402093d4..868b9551438efb0a 100644 > --- a/drivers/pinctrl/sh-pfc/core.c > +++ b/drivers/pinctrl/sh-pfc/core.c > @@ -717,7 +717,7 @@ static int sh_pfc_suspend_init(struct sh_pfc *pfc) { return 0; } > #endif /* CONFIG_PM_SLEEP && CONFIG_ARM_PSCI_FW */ > > #ifdef DEBUG > -static bool is0s(const u16 *enum_ids, unsigned int n) > +static bool __init is0s(const u16 *enum_ids, unsigned int n) > { > unsigned int i; > > @@ -728,11 +728,11 @@ static bool is0s(const u16 *enum_ids, unsigned int n) > return true; > } > > -static unsigned int sh_pfc_errors; > -static unsigned int sh_pfc_warnings; > +static unsigned int sh_pfc_errors __initdata = 0; > +static unsigned int sh_pfc_warnings __initdata = 0; > > -static void sh_pfc_check_cfg_reg(const char *drvname, > - const struct pinmux_cfg_reg *cfg_reg) > +static void __init sh_pfc_check_cfg_reg(const char *drvname, > + const struct pinmux_cfg_reg *cfg_reg) > { > unsigned int i, n, rw, fw; > > @@ -764,7 +764,7 @@ static void sh_pfc_check_cfg_reg(const char *drvname, > } > } > > -static void sh_pfc_check_info(const struct sh_pfc_soc_info *info) > +static void __init sh_pfc_check_info(const struct sh_pfc_soc_info *info) > { > const struct sh_pfc_function *func; > const char *drvname = info->name; > @@ -816,7 +816,7 @@ static void sh_pfc_check_info(const struct sh_pfc_soc_info *info) > sh_pfc_check_cfg_reg(drvname, &info->cfg_regs[i]); > } > > -static void sh_pfc_check_driver(const struct platform_driver *pdrv) > +static void __init sh_pfc_check_driver(const struct platform_driver *pdrv) > { > unsigned int i; > > -- > 2.17.1 >
diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c index 18d7f6d9402093d4..868b9551438efb0a 100644 --- a/drivers/pinctrl/sh-pfc/core.c +++ b/drivers/pinctrl/sh-pfc/core.c @@ -717,7 +717,7 @@ static int sh_pfc_suspend_init(struct sh_pfc *pfc) { return 0; } #endif /* CONFIG_PM_SLEEP && CONFIG_ARM_PSCI_FW */ #ifdef DEBUG -static bool is0s(const u16 *enum_ids, unsigned int n) +static bool __init is0s(const u16 *enum_ids, unsigned int n) { unsigned int i; @@ -728,11 +728,11 @@ static bool is0s(const u16 *enum_ids, unsigned int n) return true; } -static unsigned int sh_pfc_errors; -static unsigned int sh_pfc_warnings; +static unsigned int sh_pfc_errors __initdata = 0; +static unsigned int sh_pfc_warnings __initdata = 0; -static void sh_pfc_check_cfg_reg(const char *drvname, - const struct pinmux_cfg_reg *cfg_reg) +static void __init sh_pfc_check_cfg_reg(const char *drvname, + const struct pinmux_cfg_reg *cfg_reg) { unsigned int i, n, rw, fw; @@ -764,7 +764,7 @@ static void sh_pfc_check_cfg_reg(const char *drvname, } } -static void sh_pfc_check_info(const struct sh_pfc_soc_info *info) +static void __init sh_pfc_check_info(const struct sh_pfc_soc_info *info) { const struct sh_pfc_function *func; const char *drvname = info->name; @@ -816,7 +816,7 @@ static void sh_pfc_check_info(const struct sh_pfc_soc_info *info) sh_pfc_check_cfg_reg(drvname, &info->cfg_regs[i]); } -static void sh_pfc_check_driver(const struct platform_driver *pdrv) +static void __init sh_pfc_check_driver(const struct platform_driver *pdrv) { unsigned int i;
All run-time debug code is called from sh_pfc_init(), which is __init. Fixes: 6161b39a14380815 ("pinctrl: sh-pfc: Validate pinmux tables at runtime when debugging") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/pinctrl/sh-pfc/core.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)