Re: [PATCH 31/36] powerpc: asm: hvconsole: Move 'hvc_vio_init_early's prototype to shared location
On Thu, 05 Nov 2020, Michael Ellerman wrote: > Lee Jones writes: > > Fixes the following W=1 kernel build warning(s): > > > > drivers/tty/hvc/hvc_vio.c:385:13: warning: no previous prototype for > > ‘hvc_vio_init_early’ [-Wmissing-prototypes] > > 385 | void __init hvc_vio_init_early(void) > > | ^~ > > > > Cc: Michael Ellerman > > Cc: Benjamin Herrenschmidt > > Cc: Paul Mackerras > > Cc: linuxppc-dev@lists.ozlabs.org > > Signed-off-by: Lee Jones > > --- > > arch/powerpc/include/asm/hvconsole.h | 3 +++ > > arch/powerpc/platforms/pseries/pseries.h | 3 --- > > arch/powerpc/platforms/pseries/setup.c | 1 + > > 3 files changed, 4 insertions(+), 3 deletions(-) > > Acked-by: Michael Ellerman Thanks. > > diff --git a/arch/powerpc/include/asm/hvconsole.h > > b/arch/powerpc/include/asm/hvconsole.h > > index 999ed5ac90531..936a1ee1ac786 100644 > > --- a/arch/powerpc/include/asm/hvconsole.h > > +++ b/arch/powerpc/include/asm/hvconsole.h > > @@ -24,5 +24,8 @@ > > extern int hvc_get_chars(uint32_t vtermno, char *buf, int count); > > extern int hvc_put_chars(uint32_t vtermno, const char *buf, int count); > > > > +/* Provided by HVC VIO */ > > +extern void hvc_vio_init_early(void); > > extern isn't needed, but don't feel you need to respin just to drop it. That's fine. I don't mind re-spinning. -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 31/36] powerpc: asm: hvconsole: Move 'hvc_vio_init_early's prototype to shared location
On Thu, 05 Nov 2020, Christophe Leroy wrote: > > > Le 04/11/2020 à 20:35, Lee Jones a écrit : > > Fixes the following W=1 kernel build warning(s): > > > > drivers/tty/hvc/hvc_vio.c:385:13: warning: no previous prototype for > > ‘hvc_vio_init_early’ [-Wmissing-prototypes] > > 385 | void __init hvc_vio_init_early(void) > > | ^~ > > > > Cc: Michael Ellerman > > Cc: Benjamin Herrenschmidt > > Cc: Paul Mackerras > > Cc: linuxppc-dev@lists.ozlabs.org > > Signed-off-by: Lee Jones > > --- > > arch/powerpc/include/asm/hvconsole.h | 3 +++ > > arch/powerpc/platforms/pseries/pseries.h | 3 --- > > arch/powerpc/platforms/pseries/setup.c | 1 + > > 3 files changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/arch/powerpc/include/asm/hvconsole.h > > b/arch/powerpc/include/asm/hvconsole.h > > index 999ed5ac90531..936a1ee1ac786 100644 > > --- a/arch/powerpc/include/asm/hvconsole.h > > +++ b/arch/powerpc/include/asm/hvconsole.h > > @@ -24,5 +24,8 @@ > > extern int hvc_get_chars(uint32_t vtermno, char *buf, int count); > > extern int hvc_put_chars(uint32_t vtermno, const char *buf, int count); > > +/* Provided by HVC VIO */ > > +extern void hvc_vio_init_early(void); > > + > > Declaring a prototype 'extern' is pointless. Don't add new misuse of 'extern' > keyword. No new code (misuse or otherwise) is being added in this patch. It's just moved from one place to another. I can also strip out 'extern' if it's preferred. > > #endif /* __KERNEL__ */ > > #endif /* _PPC64_HVCONSOLE_H */ > > diff --git a/arch/powerpc/platforms/pseries/pseries.h > > b/arch/powerpc/platforms/pseries/pseries.h > > index 13fa370a87e4e..7be5b054dfc36 100644 > > --- a/arch/powerpc/platforms/pseries/pseries.h > > +++ b/arch/powerpc/platforms/pseries/pseries.h > > @@ -43,9 +43,6 @@ extern void pSeries_final_fixup(void); > > /* Poweron flag used for enabling auto ups restart */ > > extern unsigned long rtas_poweron_auto; > > -/* Provided by HVC VIO */ > > -extern void hvc_vio_init_early(void); > > - > > /* Dynamic logical Partitioning/Mobility */ > > extern void dlpar_free_cc_nodes(struct device_node *); > > extern void dlpar_free_cc_property(struct property *); > > diff --git a/arch/powerpc/platforms/pseries/setup.c > > b/arch/powerpc/platforms/pseries/setup.c > > index 633c45ec406da..6999b83f06612 100644 > > --- a/arch/powerpc/platforms/pseries/setup.c > > +++ b/arch/powerpc/platforms/pseries/setup.c > > @@ -71,6 +71,7 @@ > > #include > > #include > > #include > > +#include > > #include "pseries.h" > > #include "../../../../drivers/pci/pci.h" > > > > Christophe -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 31/36] powerpc: asm: hvconsole: Move 'hvc_vio_init_early's prototype to shared location
Le 04/11/2020 à 20:35, Lee Jones a écrit : Fixes the following W=1 kernel build warning(s): drivers/tty/hvc/hvc_vio.c:385:13: warning: no previous prototype for ‘hvc_vio_init_early’ [-Wmissing-prototypes] 385 | void __init hvc_vio_init_early(void) | ^~ Cc: Michael Ellerman Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Lee Jones --- arch/powerpc/include/asm/hvconsole.h | 3 +++ arch/powerpc/platforms/pseries/pseries.h | 3 --- arch/powerpc/platforms/pseries/setup.c | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/include/asm/hvconsole.h b/arch/powerpc/include/asm/hvconsole.h index 999ed5ac90531..936a1ee1ac786 100644 --- a/arch/powerpc/include/asm/hvconsole.h +++ b/arch/powerpc/include/asm/hvconsole.h @@ -24,5 +24,8 @@ extern int hvc_get_chars(uint32_t vtermno, char *buf, int count); extern int hvc_put_chars(uint32_t vtermno, const char *buf, int count); +/* Provided by HVC VIO */ +extern void hvc_vio_init_early(void); + Declaring a prototype 'extern' is pointless. Don't add new misuse of 'extern' keyword. #endif /* __KERNEL__ */ #endif /* _PPC64_HVCONSOLE_H */ diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h index 13fa370a87e4e..7be5b054dfc36 100644 --- a/arch/powerpc/platforms/pseries/pseries.h +++ b/arch/powerpc/platforms/pseries/pseries.h @@ -43,9 +43,6 @@ extern void pSeries_final_fixup(void); /* Poweron flag used for enabling auto ups restart */ extern unsigned long rtas_poweron_auto; -/* Provided by HVC VIO */ -extern void hvc_vio_init_early(void); - /* Dynamic logical Partitioning/Mobility */ extern void dlpar_free_cc_nodes(struct device_node *); extern void dlpar_free_cc_property(struct property *); diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 633c45ec406da..6999b83f06612 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -71,6 +71,7 @@ #include #include #include +#include #include "pseries.h" #include "../../../../drivers/pci/pci.h" Christophe
Re: [PATCH 31/36] powerpc: asm: hvconsole: Move 'hvc_vio_init_early's prototype to shared location
Lee Jones writes: > Fixes the following W=1 kernel build warning(s): > > drivers/tty/hvc/hvc_vio.c:385:13: warning: no previous prototype for > ‘hvc_vio_init_early’ [-Wmissing-prototypes] > 385 | void __init hvc_vio_init_early(void) > | ^~ > > Cc: Michael Ellerman > Cc: Benjamin Herrenschmidt > Cc: Paul Mackerras > Cc: linuxppc-dev@lists.ozlabs.org > Signed-off-by: Lee Jones > --- > arch/powerpc/include/asm/hvconsole.h | 3 +++ > arch/powerpc/platforms/pseries/pseries.h | 3 --- > arch/powerpc/platforms/pseries/setup.c | 1 + > 3 files changed, 4 insertions(+), 3 deletions(-) Acked-by: Michael Ellerman > diff --git a/arch/powerpc/include/asm/hvconsole.h > b/arch/powerpc/include/asm/hvconsole.h > index 999ed5ac90531..936a1ee1ac786 100644 > --- a/arch/powerpc/include/asm/hvconsole.h > +++ b/arch/powerpc/include/asm/hvconsole.h > @@ -24,5 +24,8 @@ > extern int hvc_get_chars(uint32_t vtermno, char *buf, int count); > extern int hvc_put_chars(uint32_t vtermno, const char *buf, int count); > > +/* Provided by HVC VIO */ > +extern void hvc_vio_init_early(void); extern isn't needed, but don't feel you need to respin just to drop it. cheers
