| Message ID | 20180620190038.3250-1-malat@debian.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [v3] powerpc/32: Remove left over function prototypes | expand |
Mathieu Malaterre <malat@debian.org> writes: > In commit 4aea909eeba3 ("powerpc: Add missing prototypes in setup_32.c") I don't have that commit ^ ? That might be because I squashed some of your fixes together or something? > diff --git a/arch/powerpc/kernel/setup.h b/arch/powerpc/kernel/setup.h > index 35ca309848d7..829ed66f0a40 100644 > --- a/arch/powerpc/kernel/setup.h > +++ b/arch/powerpc/kernel/setup.h > @@ -19,9 +19,6 @@ void irqstack_early_init(void); > void setup_power_save(void); > unsigned long __init early_init(unsigned long dt_ptr); > void __init machine_init(u64 dt_ptr); > -int __init ppc_setup_l2cr(char *str); > -int __init ppc_setup_l3cr(char *str); > -int __init ppc_init(void); > #else > static inline void setup_power_save(void) { }; > #endif I have: #ifdef CONFIG_PPC32 void setup_power_save(void); #else static inline void setup_power_save(void) { }; #endif cheers
On Thu, Jun 21, 2018 at 1:27 PM Michael Ellerman <mpe@ellerman.id.au> wrote: > > Mathieu Malaterre <malat@debian.org> writes: > > > In commit 4aea909eeba3 ("powerpc: Add missing prototypes in setup_32.c") > > I don't have that commit ^ ? > > That might be because I squashed some of your fixes together or something? I am doing an awful lots of mistakes these days. Indeed you've changed one of my patch: https://patchwork.kernel.org/patch/10240997/ This one appeared after a git rebase on my side. > > diff --git a/arch/powerpc/kernel/setup.h b/arch/powerpc/kernel/setup.h > > index 35ca309848d7..829ed66f0a40 100644 > > --- a/arch/powerpc/kernel/setup.h > > +++ b/arch/powerpc/kernel/setup.h > > @@ -19,9 +19,6 @@ void irqstack_early_init(void); > > void setup_power_save(void); > > unsigned long __init early_init(unsigned long dt_ptr); > > void __init machine_init(u64 dt_ptr); > > -int __init ppc_setup_l2cr(char *str); > > -int __init ppc_setup_l3cr(char *str); > > -int __init ppc_init(void); > > #else > > static inline void setup_power_save(void) { }; > > #endif > > I have: > > #ifdef CONFIG_PPC32 > void setup_power_save(void); > #else > static inline void setup_power_save(void) { }; > #endif Correct. Sorry for the noise. > > cheers
Mathieu Malaterre <malat@debian.org> writes: > On Thu, Jun 21, 2018 at 1:27 PM Michael Ellerman <mpe@ellerman.id.au> wrote: >> Mathieu Malaterre <malat@debian.org> writes: >> >> > In commit 4aea909eeba3 ("powerpc: Add missing prototypes in setup_32.c") >> >> I don't have that commit ^ ? >> >> That might be because I squashed some of your fixes together or something? > > I am doing an awful lots of mistakes these days. Indeed you've changed > one of my patch: > > https://patchwork.kernel.org/patch/10240997/ > > This one appeared after a git rebase on my side. > >> > diff --git a/arch/powerpc/kernel/setup.h b/arch/powerpc/kernel/setup.h >> > index 35ca309848d7..829ed66f0a40 100644 >> > --- a/arch/powerpc/kernel/setup.h >> > +++ b/arch/powerpc/kernel/setup.h >> > @@ -19,9 +19,6 @@ void irqstack_early_init(void); >> > void setup_power_save(void); >> > unsigned long __init early_init(unsigned long dt_ptr); >> > void __init machine_init(u64 dt_ptr); >> > -int __init ppc_setup_l2cr(char *str); >> > -int __init ppc_setup_l3cr(char *str); >> > -int __init ppc_init(void); >> > #else >> > static inline void setup_power_save(void) { }; >> > #endif >> >> I have: >> >> #ifdef CONFIG_PPC32 >> void setup_power_save(void); >> #else >> static inline void setup_power_save(void) { }; >> #endif > > Correct. > > Sorry for the noise. OK, no worries. Thanks for persisting. cheers
diff --git a/arch/powerpc/kernel/setup.h b/arch/powerpc/kernel/setup.h index 35ca309848d7..829ed66f0a40 100644 --- a/arch/powerpc/kernel/setup.h +++ b/arch/powerpc/kernel/setup.h @@ -19,9 +19,6 @@ void irqstack_early_init(void); void setup_power_save(void); unsigned long __init early_init(unsigned long dt_ptr); void __init machine_init(u64 dt_ptr); -int __init ppc_setup_l2cr(char *str); -int __init ppc_setup_l3cr(char *str); -int __init ppc_init(void); #else static inline void setup_power_save(void) { }; #endif
In commit 4aea909eeba3 ("powerpc: Add missing prototypes in setup_32.c") prototypes for - ppc_setup_l2cr - ppc_setup_l3cr - ppc_init were added but at the same time in commit d15a261d876d ("powerpc/32: Make some functions static") those same functions were made static. Fix conflicting changes by removing the prototypes and leave the function as static. Fix the following warnings, treated as errors with W=1: arch/powerpc/kernel/setup_32.c:127:19: error: static declaration of ‘ppc_setup_l2cr’ follows non-static declaration arch/powerpc/kernel/setup_32.c:140:19: error: static declaration of ‘ppc_setup_l3cr’ follows non-static declaration arch/powerpc/kernel/setup_32.c:186:19: error: static declaration of ‘ppc_init’ follows non-static declaration Signed-off-by: Mathieu Malaterre <malat@debian.org> --- v3: correct subject line to be less confusing v2: Previous version contained the reverted patch, correct that. arch/powerpc/kernel/setup.h | 3 --- 1 file changed, 3 deletions(-)