Skip to contentSkip to conversation

mpc52xx: sparse fixes

PATCH New Domen Puncer 2 participants 3 messages Jun 21, 2007 – Jul 9, 2007

Subsystems (2)
PowerPC Linux for PowerPC embedded MPC5XXX
lore
Share & tools
lore

Domen Puncer

author
#0 lore raw

PATCH 1/1 mpc52xx: sparse fixes

sparse caught these static functions / __iomem annotations under arch/powerpc/platform/52xx/

Signed-off-by Domen Puncer <[email protected]>
---
 arch/powerpc/platforms/52xx/efika.c      |    4 ++--
 arch/powerpc/platforms/52xx/lite5200.c   |    2 +-
 arch/powerpc/platforms/52xx/mpc52xx_pm.c |    8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)
arch/powerpc/platforms/52xx/efika.c +2 -2
Index: work-powerpc.git/arch/powerpc/platforms/52xx/efika.c
===================================================================
@@ -83,7 +83,7 @@ static struct pci_ops rtas_pci_ops = {
 };
 
 
-void __init efika_pcisetup(void)
+static void __init efika_pcisetup(void)
 {
 	const int *bus_range;
 	int len;

@@ -145,7 +145,7 @@ void __init efika_pcisetup(void)
 }
 
 #else
-void __init efika_pcisetup(void)
+static void __init efika_pcisetup(void)
 {}
 #endif
arch/powerpc/platforms/52xx/lite5200.c +1 -1
Index: work-powerpc.git/arch/powerpc/platforms/52xx/lite5200.c
===================================================================
@@ -158,7 +158,7 @@ static void __init lite5200_setup_arch(v
 
 }
 
-void lite5200_show_cpuinfo(struct seq_file *m)
+static void lite5200_show_cpuinfo(struct seq_file *m)
 {
 	struct device_node* np = of_find_all_nodes(NULL);
 	const char *model = NULL;
arch/powerpc/platforms/52xx/mpc52xx_pm.c +4 -4
Index: work-powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_pm.c
===================================================================
@@ -9,8 +9,8 @@
 
 
 /* these are defined in mpc52xx_sleep.S, and only used here */
-extern void mpc52xx_deep_sleep(void *sram, void *sdram_regs,
-		struct mpc52xx_cdm *, struct mpc52xx_intr *);
+extern void mpc52xx_deep_sleep(void __iomem *sram, void __iomem *sdram_regs,
+		struct mpc52xx_cdm __iomem *, struct mpc52xx_intr __iomem*);
 extern void mpc52xx_ds_sram(void);
 extern const long mpc52xx_ds_sram_size;
 extern void mpc52xx_ds_cached(void);

@@ -21,7 +21,7 @@ static void __iomem *sdram;
 static struct mpc52xx_cdm __iomem *cdm;
 static struct mpc52xx_intr __iomem *intr;
 static struct mpc52xx_gpio_wkup __iomem *gpiow;
-static void *sram;
+static void __iomem *sram;
 static int sram_size;
 
 struct mpc52xx_suspend mpc52xx_suspend;

@@ -100,7 +100,7 @@ int mpc52xx_pm_enter(suspend_state_t sta
 	u32 clk_enables;
 	u32 msr, hid0;
 	u32 intr_main_mask;
-	void __iomem * irq_0x500 = (void *)CONFIG_KERNEL_START + 0x500;
+	void __iomem * irq_0x500 = (void __iomem *)CONFIG_KERNEL_START + 0x500;
 	unsigned long irq_0x500_stop = (unsigned long)irq_0x500 + mpc52xx_ds_cached_size;
 	char saved_0x500[mpc52xx_ds_cached_size];
author
#1 lore raw

PATCH 1/1 mpc52xx: sparse fixes

sparse caught these static functions / __iomem annotations under arch/powerpc/platform/52xx/

Signed-off-by Domen Puncer <[email protected]>

---
Reposting, adding tnt to Cc, and requesting inclusion. The patch is pretty much harmless :-)

 arch/powerpc/platforms/52xx/efika.c      |    4 ++--
 arch/powerpc/platforms/52xx/lite5200.c   |    2 +-
 arch/powerpc/platforms/52xx/mpc52xx_pm.c |    8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)
arch/powerpc/platforms/52xx/efika.c +2 -2
Index: work-powerpc.git/arch/powerpc/platforms/52xx/efika.c
===================================================================
@@ -83,7 +83,7 @@ static struct pci_ops rtas_pci_ops = {
 };
 
 
-void __init efika_pcisetup(void)
+static void __init efika_pcisetup(void)
 {
 	const int *bus_range;
 	int len;

@@ -145,7 +145,7 @@ void __init efika_pcisetup(void)
 }
 
 #else
-void __init efika_pcisetup(void)
+static void __init efika_pcisetup(void)
 {}
 #endif
arch/powerpc/platforms/52xx/lite5200.c +1 -1
Index: work-powerpc.git/arch/powerpc/platforms/52xx/lite5200.c
===================================================================
@@ -156,7 +156,7 @@ static void __init lite5200_setup_arch(v
 
 }
 
-void lite5200_show_cpuinfo(struct seq_file *m)
+static void lite5200_show_cpuinfo(struct seq_file *m)
 {
 	struct device_node* np = of_find_all_nodes(NULL);
 	const char *model = NULL;
arch/powerpc/platforms/52xx/mpc52xx_pm.c +4 -4
Index: work-powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_pm.c
===================================================================
@@ -9,8 +9,8 @@
 
 
 /* these are defined in mpc52xx_sleep.S, and only used here */
-extern void mpc52xx_deep_sleep(void *sram, void *sdram_regs,
-		struct mpc52xx_cdm *, struct mpc52xx_intr *);
+extern void mpc52xx_deep_sleep(void __iomem *sram, void __iomem *sdram_regs,
+		struct mpc52xx_cdm __iomem *, struct mpc52xx_intr __iomem*);
 extern void mpc52xx_ds_sram(void);
 extern const long mpc52xx_ds_sram_size;
 extern void mpc52xx_ds_cached(void);

@@ -21,7 +21,7 @@ static void __iomem *sdram;
 static struct mpc52xx_cdm __iomem *cdm;
 static struct mpc52xx_intr __iomem *intr;
 static struct mpc52xx_gpio_wkup __iomem *gpiow;
-static void *sram;
+static void __iomem *sram;
 static int sram_size;
 
 struct mpc52xx_suspend mpc52xx_suspend;

@@ -100,7 +100,7 @@ int mpc52xx_pm_enter(suspend_state_t sta
 	u32 clk_enables;
 	u32 msr, hid0;
 	u32 intr_main_mask;
-	void __iomem * irq_0x500 = (void *)CONFIG_KERNEL_START + 0x500;
+	void __iomem * irq_0x500 = (void __iomem *)CONFIG_KERNEL_START + 0x500;
 	unsigned long irq_0x500_stop = (unsigned long)irq_0x500 + mpc52xx_ds_cached_size;
 	char saved_0x500[mpc52xx_ds_cached_size];
#2 lore raw
Quoted 5 lines · Domen Puncer

sparse caught these static functions / __iomem annotations under arch/powerpc/platform/52xx/

Signed-off-by Domen Puncer <[email protected]>
Signed-off-by Grant Likely <[email protected]>
Quoted 84 lines

---
Reposting, adding tnt to Cc, and requesting inclusion. The patch is pretty much harmless :-)

 arch/powerpc/platforms/52xx/efika.c      |    4 ++--
 arch/powerpc/platforms/52xx/lite5200.c   |    2 +-
 arch/powerpc/platforms/52xx/mpc52xx_pm.c |    8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

Index: work-powerpc.git/arch/powerpc/platforms/52xx/efika.c
===================================================================

arch/powerpc/platforms/52xx/efika.c +2 -2
@@ -83,7 +83,7 @@ static struct pci_ops rtas_pci_ops = {
 };
 
 
-void __init efika_pcisetup(void)
+static void __init efika_pcisetup(void)
 {
        const int *bus_range;
        int len;

@@ -145,7 +145,7 @@ void __init efika_pcisetup(void)
 }
 
 #else
-void __init efika_pcisetup(void)
+static void __init efika_pcisetup(void)
 {}
 #endif

Index: work-powerpc.git/arch/powerpc/platforms/52xx/lite5200.c
===================================================================

arch/powerpc/platforms/52xx/lite5200.c +1 -1
@@ -156,7 +156,7 @@ static void __init lite5200_setup_arch(v
 
 }
 
-void lite5200_show_cpuinfo(struct seq_file *m)
+static void lite5200_show_cpuinfo(struct seq_file *m)
 {
        struct device_node* np = of_find_all_nodes(NULL);
        const char *model = NULL;

Index: work-powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_pm.c
===================================================================

arch/powerpc/platforms/52xx/mpc52xx_pm.c +4 -4
@@ -9,8 +9,8 @@
 
 
 /* these are defined in mpc52xx_sleep.S, and only used here */
-extern void mpc52xx_deep_sleep(void *sram, void *sdram_regs,
-               struct mpc52xx_cdm *, struct mpc52xx_intr *);
+extern void mpc52xx_deep_sleep(void __iomem *sram, void __iomem *sdram_regs,
+               struct mpc52xx_cdm __iomem *, struct mpc52xx_intr __iomem*);
 extern void mpc52xx_ds_sram(void);
 extern const long mpc52xx_ds_sram_size;
 extern void mpc52xx_ds_cached(void);

@@ -21,7 +21,7 @@ static void __iomem *sdram;
 static struct mpc52xx_cdm __iomem *cdm;
 static struct mpc52xx_intr __iomem *intr;
 static struct mpc52xx_gpio_wkup __iomem *gpiow;
-static void *sram;
+static void __iomem *sram;
 static int sram_size;
 
 struct mpc52xx_suspend mpc52xx_suspend;

@@ -100,7 +100,7 @@ int mpc52xx_pm_enter(suspend_state_t sta
        u32 clk_enables;
        u32 msr, hid0;
        u32 intr_main_mask;
-       void __iomem * irq_0x500 = (void *)CONFIG_KERNEL_START + 0x500;
+       void __iomem * irq_0x500 = (void __iomem *)CONFIG_KERNEL_START + 0x500;
        unsigned long irq_0x500_stop = (unsigned long)irq_0x500 + mpc52xx_ds_cached_size;
        char saved_0x500[mpc52xx_ds_cached_size];

_______________________________________________
Linuxppc-embedded mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-embedded

Signature · 4 lines
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
[email protected]
(403) 399-0195