powerpc/85xx: Mark some functions static and add missing includes to fix no previous prototype error

chleroy · mpe · commit c265735ff5b1 · 2023-08-23T15:55:21.000+10:00
corenet{32/64}_smp_defconfig leads to: CC arch/powerpc/sysdev/ehv_pic.o arch/powerpc/sysdev/ehv_pic.c:45:6: error: no previous prototype for 'ehv_pic_unmask_irq' [-Werror=missing-prototypes] 45 | void ehv_pic_unmask_irq(struct irq_data *d) | ^~~~~~~~~~~~~~~~~~ arch/powerpc/sysdev/ehv_pic.c:52:6: error: no previous prototype for 'ehv_pic_mask_irq' [-Werror=missing-prototypes] 52 | void ehv_pic_mask_irq(struct irq_data *d) | ^~~~~~~~~~~~~~~~ arch/powerpc/sysdev/ehv_pic.c:59:6: error: no previous prototype for 'ehv_pic_end_irq' [-Werror=missing-prototypes] 59 | void ehv_pic_end_irq(struct irq_data *d) | ^~~~~~~~~~~~~~~ arch/powerpc/sysdev/ehv_pic.c:66:6: error: no previous prototype for 'ehv_pic_direct_end_irq' [-Werror=missing-prototypes] 66 | void ehv_pic_direct_end_irq(struct irq_data *d) | ^~~~~~~~~~~~~~~~~~~~~~ arch/powerpc/sysdev/ehv_pic.c:71:5: error: no previous prototype for 'ehv_pic_set_affinity' [-Werror=missing-prototypes] 71 | int ehv_pic_set_affinity(struct irq_data *d, const struct cpumask *dest, | ^~~~~~~~~~~~~~~~~~~~ arch/powerpc/sysdev/ehv_pic.c:112:5: error: no previous prototype for 'ehv_pic_set_irq_type' [-Werror=missing-prototypes] 112 | int ehv_pic_set_irq_type(struct irq_data *d, unsigned int flow_type) | ^~~~~~~~~~~~~~~~~~~~ CC arch/powerpc/sysdev/fsl_rio.o arch/powerpc/sysdev/fsl_rio.c:102:5: error: no previous prototype for 'fsl_rio_mcheck_exception' [-Werror=missing-prototypes] 102 | int fsl_rio_mcheck_exception(struct pt_regs *regs) | ^~~~~~~~~~~~~~~~~~~~~~~~ arch/powerpc/sysdev/fsl_rio.c:306:5: error: no previous prototype for 'fsl_map_inb_mem' [-Werror=missing-prototypes] 306 | int fsl_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart, | ^~~~~~~~~~~~~~~ arch/powerpc/sysdev/fsl_rio.c:357:6: error: no previous prototype for 'fsl_unmap_inb_mem' [-Werror=missing-prototypes] 357 | void fsl_unmap_inb_mem(struct rio_mport *mport, dma_addr_t lstart) | ^~~~~~~~~~~~~~~~~ arch/powerpc/sysdev/fsl_rio.c:445:5: error: no previous prototype for 'fsl_rio_setup' [-Werror=missing-prototypes] 445 | int fsl_rio_setup(struct platform_device *dev) | ^~~~~~~~~~~~~ CC arch/powerpc/sysdev/fsl_rmu.o arch/powerpc/sysdev/fsl_rmu.c:362:6: error: no previous prototype for 'msg_unit_error_handler' [-Werror=missing-prototypes] 362 | void msg_unit_error_handler(void) | ^~~~~~~~~~~~~~~~~~~~~~ CC arch/powerpc/platforms/85xx/corenet_generic.o arch/powerpc/platforms/85xx/corenet_generic.c:33:13: error: no previous prototype for 'corenet_gen_pic_init' [-Werror=missing-prototypes] 33 | void __init corenet_gen_pic_init(void) | ^~~~~~~~~~~~~~~~~~~~ arch/powerpc/platforms/85xx/corenet_generic.c:51:13: error: no previous prototype for 'corenet_gen_setup_arch' [-Werror=missing-prototypes] 51 | void __init corenet_gen_setup_arch(void) | ^~~~~~~~~~~~~~~~~~~~~~ arch/powerpc/platforms/85xx/corenet_generic.c:104:12: error: no previous prototype for 'corenet_gen_publish_devices' [-Werror=missing-prototypes] 104 | int __init corenet_gen_publish_devices(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ CC arch/powerpc/platforms/85xx/qemu_e500.o arch/powerpc/platforms/85xx/qemu_e500.c:28:13: error: no previous prototype for 'qemu_e500_pic_init' [-Werror=missing-prototypes] 28 | void __init qemu_e500_pic_init(void) | ^~~~~~~~~~~~~~~~~~ CC arch/powerpc/kernel/pmc.o arch/powerpc/kernel/pmc.c:78:6: error: no previous prototype for 'power4_enable_pmcs' [-Werror=missing-prototypes] 78 | void power4_enable_pmcs(void) | ^~~~~~~~~~~~~~~~~~ Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/c90780017b624b91771a3e4240dcbadc68137915.1692684784.git.christophe.leroy@csgroup.eu
diff --git a/arch/powerpc/kernel/pmc.c b/arch/powerpc/kernel/pmc.c
@@ -74,7 +74,7 @@ void release_pmc_hardware(void)
 }
 EXPORT_SYMBOL_GPL(release_pmc_hardware);
 
-#ifdef CONFIG_PPC64
+#ifdef CONFIG_PPC_BOOK3S_64
 void power4_enable_pmcs(void)
 {
 	unsigned long hid0;
diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c
@@ -30,7 +30,7 @@
 #include "smp.h"
 #include "mpc85xx.h"
 
-void __init corenet_gen_pic_init(void)
+static void __init corenet_gen_pic_init(void)
 {
 	struct mpic *mpic;
 	unsigned int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU |
@@ -48,7 +48,7 @@ void __init corenet_gen_pic_init(void)
 /*
  * Setup the architecture
  */
-void __init corenet_gen_setup_arch(void)
+static void __init corenet_gen_setup_arch(void)
 {
 	mpc85xx_smp_init();
 
@@ -101,7 +101,7 @@ static const struct of_device_id of_device_ids[] = {
 	{}
 };
 
-int __init corenet_gen_publish_devices(void)
+static int __init corenet_gen_publish_devices(void)
 {
 	return of_platform_bus_probe(NULL, of_device_ids, NULL);
 }
diff --git a/arch/powerpc/platforms/85xx/qemu_e500.c b/arch/powerpc/platforms/85xx/qemu_e500.c
@@ -25,7 +25,7 @@
 #include "smp.h"
 #include "mpc85xx.h"
 
-void __init qemu_e500_pic_init(void)
+static void __init qemu_e500_pic_init(void)
 {
 	struct mpic *mpic;
 	unsigned int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU |
diff --git a/arch/powerpc/sysdev/ehv_pic.c b/arch/powerpc/sysdev/ehv_pic.c
@@ -42,33 +42,33 @@ static u32 __iomem *mpic_percpu_base_vaddr;
  * Linux descriptor level callbacks
  */
 
-void ehv_pic_unmask_irq(struct irq_data *d)
+static void ehv_pic_unmask_irq(struct irq_data *d)
 {
 	unsigned int src = virq_to_hw(d->irq);
 
 	ev_int_set_mask(src, 0);
 }
 
-void ehv_pic_mask_irq(struct irq_data *d)
+static void ehv_pic_mask_irq(struct irq_data *d)
 {
 	unsigned int src = virq_to_hw(d->irq);
 
 	ev_int_set_mask(src, 1);
 }
 
-void ehv_pic_end_irq(struct irq_data *d)
+static void ehv_pic_end_irq(struct irq_data *d)
 {
 	unsigned int src = virq_to_hw(d->irq);
 
 	ev_int_eoi(src);
 }
 
-void ehv_pic_direct_end_irq(struct irq_data *d)
+static void ehv_pic_direct_end_irq(struct irq_data *d)
 {
 	out_be32(mpic_percpu_base_vaddr + MPIC_EOI / 4, 0);
 }
 
-int ehv_pic_set_affinity(struct irq_data *d, const struct cpumask *dest,
+static int ehv_pic_set_affinity(struct irq_data *d, const struct cpumask *dest,
 			 bool force)
 {
 	unsigned int src = virq_to_hw(d->irq);
@@ -109,7 +109,7 @@ static unsigned int ehv_pic_type_to_vecpri(unsigned int type)
 	}
 }
 
-int ehv_pic_set_irq_type(struct irq_data *d, unsigned int flow_type)
+static int ehv_pic_set_irq_type(struct irq_data *d, unsigned int flow_type)
 {
 	unsigned int src = virq_to_hw(d->irq);
 	unsigned int vecpri, vold, vnew, prio, cpu_dest;
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
@@ -33,6 +33,7 @@
 #include <linux/io.h>
 #include <linux/uaccess.h>
 #include <asm/machdep.h>
+#include <asm/rio.h>
 
 #include "fsl_rio.h"
 
@@ -303,8 +304,8 @@ static void fsl_rio_inbound_mem_init(struct rio_priv *priv)
 		out_be32(&priv->inb_atmu_regs[i].riwar, 0);
 }
 
-int fsl_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart,
-	u64 rstart, u64 size, u32 flags)
+static int fsl_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart,
+			   u64 rstart, u64 size, u32 flags)
 {
 	struct rio_priv *priv = mport->priv;
 	u32 base_size;
@@ -354,7 +355,7 @@ int fsl_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart,
 	return 0;
 }
 
-void fsl_unmap_inb_mem(struct rio_mport *mport, dma_addr_t lstart)
+static void fsl_unmap_inb_mem(struct rio_mport *mport, dma_addr_t lstart)
 {
 	u32 win_start_shift, base_start_shift;
 	struct rio_priv *priv = mport->priv;
@@ -442,7 +443,7 @@ static inline void fsl_rio_info(struct device *dev, u32 ccsr)
  * master port with system-specific info, and registers the
  * master port with the RapidIO subsystem.
  */
-int fsl_rio_setup(struct platform_device *dev)
+static int fsl_rio_setup(struct platform_device *dev)
 {
 	struct rio_ops *ops;
 	struct rio_mport *port;
diff --git a/arch/powerpc/sysdev/fsl_rmu.c b/arch/powerpc/sysdev/fsl_rmu.c
@@ -359,7 +359,7 @@ fsl_rio_dbell_handler(int irq, void *dev_instance)
 	return IRQ_HANDLED;
 }
 
-void msg_unit_error_handler(void)
+static void msg_unit_error_handler(void)
 {
 
 	/*XXX: Error recovery is not implemented, we just clear errors */

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ void release_pmc_hardware(void)`
`74`	`74`	`}`
`75`	`75`	`EXPORT_SYMBOL_GPL(release_pmc_hardware);`
`76`	`76`
`77`		`-#ifdef CONFIG_PPC64`
	`77`	`+#ifdef CONFIG_PPC_BOOK3S_64`
`78`	`78`	`void power4_enable_pmcs(void)`
`79`	`79`	`{`
`80`	`80`	`unsigned long hid0;`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`#include "smp.h"`
`31`	`31`	`#include "mpc85xx.h"`
`32`	`32`
`33`		`-void __init corenet_gen_pic_init(void)`
	`33`	`+static void __init corenet_gen_pic_init(void)`
`34`	`34`	`{`
`35`	`35`	`struct mpic *mpic;`
`36`	`36`	`unsigned int flags = MPIC_BIG_ENDIAN \| MPIC_SINGLE_DEST_CPU \|`
`@@ -48,7 +48,7 @@ void __init corenet_gen_pic_init(void)`
`48`	`48`	`/*`
`49`	`49`	`* Setup the architecture`
`50`	`50`	`*/`
`51`		`-void __init corenet_gen_setup_arch(void)`
	`51`	`+static void __init corenet_gen_setup_arch(void)`
`52`	`52`	`{`
`53`	`53`	`mpc85xx_smp_init();`
`54`	`54`
`@@ -101,7 +101,7 @@ static const struct of_device_id of_device_ids[] = {`
`101`	`101`	`{}`
`102`	`102`	`};`
`103`	`103`
`104`		`-int __init corenet_gen_publish_devices(void)`
	`104`	`+static int __init corenet_gen_publish_devices(void)`
`105`	`105`	`{`
`106`	`106`	`return of_platform_bus_probe(NULL, of_device_ids, NULL);`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`#include "smp.h"`
`26`	`26`	`#include "mpc85xx.h"`
`27`	`27`
`28`		`-void __init qemu_e500_pic_init(void)`
	`28`	`+static void __init qemu_e500_pic_init(void)`
`29`	`29`	`{`
`30`	`30`	`struct mpic *mpic;`
`31`	`31`	`unsigned int flags = MPIC_BIG_ENDIAN \| MPIC_SINGLE_DEST_CPU \|`
Original file line number	Diff line number	Diff line change
`@@ -42,33 +42,33 @@ static u32 __iomem *mpic_percpu_base_vaddr;`
`42`	`42`	`* Linux descriptor level callbacks`
`43`	`43`	`*/`
`44`	`44`
`45`		`-void ehv_pic_unmask_irq(struct irq_data *d)`
	`45`	`+static void ehv_pic_unmask_irq(struct irq_data *d)`
`46`	`46`	`{`
`47`	`47`	`unsigned int src = virq_to_hw(d->irq);`
`48`	`48`
`49`	`49`	`ev_int_set_mask(src, 0);`
`50`	`50`	`}`
`51`	`51`
`52`		`-void ehv_pic_mask_irq(struct irq_data *d)`
	`52`	`+static void ehv_pic_mask_irq(struct irq_data *d)`
`53`	`53`	`{`
`54`	`54`	`unsigned int src = virq_to_hw(d->irq);`
`55`	`55`
`56`	`56`	`ev_int_set_mask(src, 1);`
`57`	`57`	`}`
`58`	`58`
`59`		`-void ehv_pic_end_irq(struct irq_data *d)`
	`59`	`+static void ehv_pic_end_irq(struct irq_data *d)`
`60`	`60`	`{`
`61`	`61`	`unsigned int src = virq_to_hw(d->irq);`
`62`	`62`
`63`	`63`	`ev_int_eoi(src);`
`64`	`64`	`}`
`65`	`65`
`66`		`-void ehv_pic_direct_end_irq(struct irq_data *d)`
	`66`	`+static void ehv_pic_direct_end_irq(struct irq_data *d)`
`67`	`67`	`{`
`68`	`68`	`out_be32(mpic_percpu_base_vaddr + MPIC_EOI / 4, 0);`
`69`	`69`	`}`
`70`	`70`
`71`		`-int ehv_pic_set_affinity(struct irq_data d, const struct cpumask dest,`
	`71`	`+static int ehv_pic_set_affinity(struct irq_data d, const struct cpumask dest,`
`72`	`72`	`bool force)`
`73`	`73`	`{`
`74`	`74`	`unsigned int src = virq_to_hw(d->irq);`
`@@ -109,7 +109,7 @@ static unsigned int ehv_pic_type_to_vecpri(unsigned int type)`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
`112`		`-int ehv_pic_set_irq_type(struct irq_data *d, unsigned int flow_type)`
	`112`	`+static int ehv_pic_set_irq_type(struct irq_data *d, unsigned int flow_type)`
`113`	`113`	`{`
`114`	`114`	`unsigned int src = virq_to_hw(d->irq);`
`115`	`115`	`unsigned int vecpri, vold, vnew, prio, cpu_dest;`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ fsl_rio_dbell_handler(int irq, void *dev_instance)`
`359`	`359`	`return IRQ_HANDLED;`
`360`	`360`	`}`
`361`	`361`
`362`		`-void msg_unit_error_handler(void)`
	`362`	`+static void msg_unit_error_handler(void)`
`363`	`363`	`{`
`364`	`364`
`365`	`365`	`/XXX: Error recovery is not implemented, we just clear errors /`