| Message ID | 20180322202007.23088-14-malat@debian.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | powerpc/ppc32: make W=1 compilation errors free | expand |
Le 22/03/2018 à 21:19, Mathieu Malaterre a écrit : > The function prototypes were declared within a `#ifdef CONFIG_PPC_LITE5200` > block which would prevent them from being visible when compiling > `mpc52xx_pm.c`. Move the prototypes outside of the `#ifdef` block to fix > the following warnings treated as errors with W=1: > > arch/powerpc/platforms/52xx/mpc52xx_pm.c:58:5: error: no previous prototype for ‘mpc52xx_pm_prepare’ [-Werror=missing-prototypes] > arch/powerpc/platforms/52xx/mpc52xx_pm.c:113:5: error: no previous prototype for ‘mpc52xx_pm_enter’ [-Werror=missing-prototypes] > arch/powerpc/platforms/52xx/mpc52xx_pm.c:181:6: error: no previous prototype for ‘mpc52xx_pm_finish’ [-Werror=missing-prototypes] > > Signed-off-by: Mathieu Malaterre <malat@debian.org> > --- > arch/powerpc/include/asm/mpc52xx.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/include/asm/mpc52xx.h b/arch/powerpc/include/asm/mpc52xx.h > index e94cede14522..0f6b3cbb119f 100644 > --- a/arch/powerpc/include/asm/mpc52xx.h > +++ b/arch/powerpc/include/asm/mpc52xx.h > @@ -350,14 +350,14 @@ extern struct mpc52xx_suspend mpc52xx_suspend; > extern int __init mpc52xx_pm_init(void); > extern int mpc52xx_set_wakeup_gpio(u8 pin, u8 level); > > -#ifdef CONFIG_PPC_LITE5200 > -extern int __init lite5200_pm_init(void); > - > /* lite5200 calls mpc5200 suspend functions, so here they are */ > extern int mpc52xx_pm_prepare(void); > extern int mpc52xx_pm_enter(suspend_state_t); > extern void mpc52xx_pm_finish(void); > extern char saved_sram[0x4000]; /* reuse buffer from mpc52xx suspend */ > + > +#ifdef CONFIG_PPC_LITE5200 > +extern int __init lite5200_pm_init(void); extern keyword is not needed Christophe > #endif > #endif /* CONFIG_PM */ > > --- L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel antivirus Avast. https://www.avast.com/antivirus
diff --git a/arch/powerpc/include/asm/mpc52xx.h b/arch/powerpc/include/asm/mpc52xx.h index e94cede14522..0f6b3cbb119f 100644 --- a/arch/powerpc/include/asm/mpc52xx.h +++ b/arch/powerpc/include/asm/mpc52xx.h @@ -350,14 +350,14 @@ extern struct mpc52xx_suspend mpc52xx_suspend; extern int __init mpc52xx_pm_init(void); extern int mpc52xx_set_wakeup_gpio(u8 pin, u8 level); -#ifdef CONFIG_PPC_LITE5200 -extern int __init lite5200_pm_init(void); - /* lite5200 calls mpc5200 suspend functions, so here they are */ extern int mpc52xx_pm_prepare(void); extern int mpc52xx_pm_enter(suspend_state_t); extern void mpc52xx_pm_finish(void); extern char saved_sram[0x4000]; /* reuse buffer from mpc52xx suspend */ + +#ifdef CONFIG_PPC_LITE5200 +extern int __init lite5200_pm_init(void); #endif #endif /* CONFIG_PM */
The function prototypes were declared within a `#ifdef CONFIG_PPC_LITE5200` block which would prevent them from being visible when compiling `mpc52xx_pm.c`. Move the prototypes outside of the `#ifdef` block to fix the following warnings treated as errors with W=1: arch/powerpc/platforms/52xx/mpc52xx_pm.c:58:5: error: no previous prototype for ‘mpc52xx_pm_prepare’ [-Werror=missing-prototypes] arch/powerpc/platforms/52xx/mpc52xx_pm.c:113:5: error: no previous prototype for ‘mpc52xx_pm_enter’ [-Werror=missing-prototypes] arch/powerpc/platforms/52xx/mpc52xx_pm.c:181:6: error: no previous prototype for ‘mpc52xx_pm_finish’ [-Werror=missing-prototypes] Signed-off-by: Mathieu Malaterre <malat@debian.org> --- arch/powerpc/include/asm/mpc52xx.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)