Re: [PATCH v2 1/2] powerpc/powermac: add missing g5_phy_disable_cpu1() declaration
On 23/09/2021 15:21, Michael Ellerman wrote: > Krzysztof Kozlowski writes: >> g5_phy_disable_cpu1() is used outside of platforms/powermac/feature.c, >> so it should have a declaration to fix W=1 warning: >> >> arch/powerpc/platforms/powermac/feature.c:1533:6: >> error: no previous prototype for ‘g5_phy_disable_cpu1’ >> [-Werror=missing-prototypes] >> >> Signed-off-by: Krzysztof Kozlowski >> >> --- >> >> Changes since v1: >> 1. Drop declaration in powermac/smp.c > > Sorry I missed v1, so I'm going to ask for more changes :} > >> arch/powerpc/include/asm/pmac_feature.h | 4 > > Putting it here exposes it to the whole kernel, but it's only needed > inside arch/powerpc/platforms/powermac. > > The right place for the prototype is arch/powerpc/platforms/powermac/pmac.h, > which is for platform internal prototypes. I'll fix it up. > >> arch/powerpc/platforms/powermac/smp.c | 2 -- >> 2 files changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/arch/powerpc/include/asm/pmac_feature.h >> b/arch/powerpc/include/asm/pmac_feature.h >> index e08e829261b6..7703e5bf1203 100644 >> --- a/arch/powerpc/include/asm/pmac_feature.h >> +++ b/arch/powerpc/include/asm/pmac_feature.h >> @@ -143,6 +143,10 @@ >> */ >> struct device_node; >> >> +#ifdef CONFIG_PPC64 >> +void g5_phy_disable_cpu1(void); >> +#endif /* CONFIG_PPC64 */ > > The ifdef around the prototype doesn't gain much, and is extra visual > noise, so I'd rather without it. Sure. Best regards, Krzysztof
Re: [PATCH v2 1/2] powerpc/powermac: add missing g5_phy_disable_cpu1() declaration
Krzysztof Kozlowski writes: > g5_phy_disable_cpu1() is used outside of platforms/powermac/feature.c, > so it should have a declaration to fix W=1 warning: > > arch/powerpc/platforms/powermac/feature.c:1533:6: > error: no previous prototype for ‘g5_phy_disable_cpu1’ > [-Werror=missing-prototypes] > > Signed-off-by: Krzysztof Kozlowski > > --- > > Changes since v1: > 1. Drop declaration in powermac/smp.c Sorry I missed v1, so I'm going to ask for more changes :} > arch/powerpc/include/asm/pmac_feature.h | 4 Putting it here exposes it to the whole kernel, but it's only needed inside arch/powerpc/platforms/powermac. The right place for the prototype is arch/powerpc/platforms/powermac/pmac.h, which is for platform internal prototypes. > arch/powerpc/platforms/powermac/smp.c | 2 -- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/include/asm/pmac_feature.h > b/arch/powerpc/include/asm/pmac_feature.h > index e08e829261b6..7703e5bf1203 100644 > --- a/arch/powerpc/include/asm/pmac_feature.h > +++ b/arch/powerpc/include/asm/pmac_feature.h > @@ -143,6 +143,10 @@ > */ > struct device_node; > > +#ifdef CONFIG_PPC64 > +void g5_phy_disable_cpu1(void); > +#endif /* CONFIG_PPC64 */ The ifdef around the prototype doesn't gain much, and is extra visual noise, so I'd rather without it. cheers
[PATCH v2 1/2] powerpc/powermac: add missing g5_phy_disable_cpu1() declaration
g5_phy_disable_cpu1() is used outside of platforms/powermac/feature.c, so it should have a declaration to fix W=1 warning: arch/powerpc/platforms/powermac/feature.c:1533:6: error: no previous prototype for ‘g5_phy_disable_cpu1’ [-Werror=missing-prototypes] Signed-off-by: Krzysztof Kozlowski --- Changes since v1: 1. Drop declaration in powermac/smp.c --- arch/powerpc/include/asm/pmac_feature.h | 4 arch/powerpc/platforms/powermac/smp.c | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/pmac_feature.h b/arch/powerpc/include/asm/pmac_feature.h index e08e829261b6..7703e5bf1203 100644 --- a/arch/powerpc/include/asm/pmac_feature.h +++ b/arch/powerpc/include/asm/pmac_feature.h @@ -143,6 +143,10 @@ */ struct device_node; +#ifdef CONFIG_PPC64 +void g5_phy_disable_cpu1(void); +#endif /* CONFIG_PPC64 */ + static inline long pmac_call_feature(int selector, struct device_node* node, long param, long value) { diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c index 3256a316e884..5d0626f432d5 100644 --- a/arch/powerpc/platforms/powermac/smp.c +++ b/arch/powerpc/platforms/powermac/smp.c @@ -875,8 +875,6 @@ static int smp_core99_cpu_online(unsigned int cpu) static void __init smp_core99_bringup_done(void) { - extern void g5_phy_disable_cpu1(void); - /* Close i2c bus if it was used for tb sync */ if (pmac_tb_clock_chip_host) pmac_i2c_close(pmac_tb_clock_chip_host); -- 2.30.2