# \[PATCH v2 1/2\] powerpc/powermac: add missing g5\_phy\_disable\_cpu1() declaration - Subsystems: LINUX FOR POWER MACINTOSH, LINUX FOR POWERPC (32-BIT AND 64-BIT), THE REST - Maintainers: Madhavan Srinivasan, Linus Torvalds - List: linuxppc-dev - 4 messages, 2 authors - Page: https://ratatoskr.run/linuxppc-dev/2021/09/1518484/t ## \[PATCH v2 1/2\] powerpc/powermac: add missing g5\_phy\_disable\_cpu1() declaration - From: Krzysztof Kozlowski \ - Date: 2021-09-22 16:05:20 - Message: https://ratatoskr.run/linuxppc-dev/2021/09/1518484.md ```text 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 ``` ## \[PATCH v2 2/2\] powerpc/powermac: constify device\_node in of\_irq\_parse\_oldworld() - From: Krzysztof Kozlowski \ - Date: 2021-09-22 16:05:22 - Message: https://ratatoskr.run/linuxppc-dev/2021/09/1518485.md ```text The of_irq_parse_oldworld() does not modify passed device_node so make it a pointer to const for safety. Drop the extern while modifying the line. Signed-off-by: Krzysztof Kozlowski --- Changes since v1: 1. Drop extern. --- arch/powerpc/platforms/powermac/pic.c | 2 +- include/linux/of_irq.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c index 4921bccf0376..af5ca1f41bb1 100644 --- a/arch/powerpc/platforms/powermac/pic.c +++ b/arch/powerpc/platforms/powermac/pic.c @@ -384,7 +384,7 @@ static void __init pmac_pic_probe_oldstyle(void) #endif } -int of_irq_parse_oldworld(struct device_node *device, int index, +int of_irq_parse_oldworld(const struct device_node *device, int index, struct of_phandle_args *out_irq) { const u32 *ints = NULL; diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index aaf219bd0354..83fccd0c9bba 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h @@ -20,12 +20,12 @@ typedef int (*of_irq_init_cb_t)(struct device_node *, struct device_node *); #if defined(CONFIG_PPC32) && defined(CONFIG_PPC_PMAC) extern unsigned int of_irq_workarounds; extern struct device_node *of_irq_dflt_pic; -extern int of_irq_parse_oldworld(struct device_node *device, int index, - struct of_phandle_args *out_irq); +int of_irq_parse_oldworld(const struct device_node *device, int index, + struct of_phandle_args *out_irq); #else /* CONFIG_PPC32 && CONFIG_PPC_PMAC */ #define of_irq_workarounds (0) #define of_irq_dflt_pic (NULL) -static inline int of_irq_parse_oldworld(struct device_node *device, int index, +static inline int of_irq_parse_oldworld(const struct device_node *device, int index, struct of_phandle_args *out_irq) { return -EINVAL; -- 2.30.2 ``` ## Re: \[PATCH v2 1/2\] powerpc/powermac: add missing g5\_phy\_disable\_cpu1() declaration - From: Michael Ellerman \ - Date: 2021-09-23 13:22:13 - Message: https://ratatoskr.run/linuxppc-dev/2021/09/1519538.md ```text Krzysztof Kozlowski [ref] 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 ``` ## Re: \[PATCH v2 1/2\] powerpc/powermac: add missing g5\_phy\_disable\_cpu1() declaration - From: Krzysztof Kozlowski \ - Date: 2021-09-23 13:32:13 - Message: https://ratatoskr.run/linuxppc-dev/2021/09/1519563.md ```text On 23/09/2021 15:21, Michael Ellerman wrote: > Krzysztof Kozlowski [ref] 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 ```