From 3aca383c7230d72b8f8570ee9207b87ef48fcf20 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 31 Jul 2010 10:06:05 +0000 Subject: [PATCH] brcm47xx: some checkpatch fixes SVN-Revision: 22425 --- .../patches-2.6.34/210-b44_phy_fix.patch | 4 ++-- .../301-kmod-fuse-dcache-bug-r4k.patch | 9 +++++---- .../patches-2.6.34/400-arch-bcm47xx.patch | 4 ++-- .../700-ssb-gigabit-ethernet-driver.patch | 2 +- .../patches-2.6.34/920-cache-wround.patch | 19 +++++++++++-------- .../patches-2.6.34/950-sbb-sysfs-files.patch | 4 ++-- .../patches-2.6.35/210-b44_phy_fix.patch | 4 ++-- .../301-kmod-fuse-dcache-bug-r4k.patch | 9 +++++---- .../patches-2.6.35/400-arch-bcm47xx.patch | 8 ++++---- .../700-ssb-gigabit-ethernet-driver.patch | 2 +- .../patches-2.6.35/920-cache-wround.patch | 19 +++++++++++-------- .../patches-2.6.35/950-sbb-sysfs-files.patch | 4 ++-- 12 files changed, 48 insertions(+), 40 deletions(-) diff --git a/target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch index f07968a240f..a1b3224643b 100644 --- a/target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch +++ b/target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch @@ -67,8 +67,8 @@ { } + -+static inline void b44_bcm47xx_workarounds(struct b44 *bp) -+{ ++static inline void b44_bcm47xx_workarounds(struct b44 *bp) ++{ +} #endif diff --git a/target/linux/brcm47xx/patches-2.6.34/301-kmod-fuse-dcache-bug-r4k.patch b/target/linux/brcm47xx/patches-2.6.34/301-kmod-fuse-dcache-bug-r4k.patch index 10bf131238e..62f699298c2 100644 --- a/target/linux/brcm47xx/patches-2.6.34/301-kmod-fuse-dcache-bug-r4k.patch +++ b/target/linux/brcm47xx/patches-2.6.34/301-kmod-fuse-dcache-bug-r4k.patch @@ -18,14 +18,15 @@ unsigned long addr, unsigned long pfn) { struct flush_cache_page_args args; -@@ -1469,3 +1469,10 @@ void __cpuinit r4k_cache_init(void) +@@ -1469,3 +1469,11 @@ void __cpuinit r4k_cache_init(void) coherency_setup(); #endif } + -+// fuse package DCACHE BUG patch exports ++/* fuse package DCACHE BUG patch exports */ +void (*fuse_flush_cache_all)(void) = r4k___flush_cache_all; ++EXPORT_SYMBOL(fuse_flush_cache_all); ++ +void (*fuse_flush_cache_page)(struct vm_area_struct *vma, unsigned long page, -+ unsigned long pfn) = r4k_flush_cache_page; ++ unsigned long pfn) = r4k_flush_cache_page; +EXPORT_SYMBOL(fuse_flush_cache_page); -+EXPORT_SYMBOL(fuse_flush_cache_all); diff --git a/target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch index 722a94ba5f6..439a53a4515 100644 --- a/target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch +++ b/target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch @@ -1,7 +1,7 @@ --- a/arch/mips/bcm47xx/nvram.c +++ b/arch/mips/bcm47xx/nvram.c @@ -92,3 +92,30 @@ int nvram_getenv(char *name, char *val, - return 1; + return -9; } EXPORT_SYMBOL(nvram_getenv); + @@ -33,7 +33,7 @@ +EXPORT_SYMBOL(nvram_get); --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c -@@ -236,3 +236,20 @@ void __init plat_mem_setup(void) +@@ -238,3 +238,20 @@ void __init plat_mem_setup(void) _machine_halt = bcm47xx_machine_halt; pm_power_off = bcm47xx_machine_halt; } diff --git a/target/linux/brcm47xx/patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch index 384b925a069..05fa0c7f991 100644 --- a/target/linux/brcm47xx/patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch +++ b/target/linux/brcm47xx/patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch @@ -111,7 +111,7 @@ + if (tp->tg3_flags3 & TG3_FLG3_ROBOSWITCH) { + current_link_up = 1; -+ current_speed = SPEED_1000; //FIXME ++ current_speed = SPEED_1000; /* FIXME */ + current_duplex = DUPLEX_FULL; + tp->link_config.active_speed = current_speed; + tp->link_config.active_duplex = current_duplex; diff --git a/target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch b/target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch index b9b22256a3d..4769f2cf9fc 100644 --- a/target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch +++ b/target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch @@ -1,25 +1,28 @@ --- a/arch/mips/include/asm/r4kcache.h +++ b/arch/mips/include/asm/r4kcache.h -@@ -20,10 +20,25 @@ +@@ -20,10 +20,28 @@ #ifdef CONFIG_BCM47XX #include #include -#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE))) +#define BCM4710_DUMMY_RREG() bcm4710_dummy_rreg() + -+static inline unsigned long bcm4710_dummy_rreg(void) { -+ return (*(volatile unsigned long *)(KSEG1ADDR(SSB_ENUM_BASE))); ++static inline unsigned long bcm4710_dummy_rreg(void) ++{ ++ return *(volatile unsigned long *)(KSEG1ADDR(SSB_ENUM_BASE)); +} + -+#define BCM4710_FILL_TLB(addr) bcm4710_fill_tlb((void*)(addr)) ++#define BCM4710_FILL_TLB(addr) bcm4710_fill_tlb((void *)(addr)) + -+static inline unsigned long bcm4710_fill_tlb(void *addr) { -+ return (*(unsigned long *)addr); ++static inline unsigned long bcm4710_fill_tlb(void *addr) ++{ ++ return *(unsigned long *)addr; +} + -+#define BCM4710_PROTECTED_FILL_TLB(addr) bcm4710_protected_fill_tlb((void*)(addr)) ++#define BCM4710_PROTECTED_FILL_TLB(addr) bcm4710_protected_fill_tlb((void *)(addr)) + -+static inline void bcm4710_protected_fill_tlb(void *addr) { ++static inline void bcm4710_protected_fill_tlb(void *addr) ++{ + unsigned long x; + get_dbe(x, (unsigned long *)addr);; +} diff --git a/target/linux/brcm47xx/patches-2.6.34/950-sbb-sysfs-files.patch b/target/linux/brcm47xx/patches-2.6.34/950-sbb-sysfs-files.patch index ddb1f1b3835..021c3c890b6 100644 --- a/target/linux/brcm47xx/patches-2.6.34/950-sbb-sysfs-files.patch +++ b/target/linux/brcm47xx/patches-2.6.34/950-sbb-sysfs-files.patch @@ -8,7 +8,7 @@ +static ssize_t \ +attrib##_show(struct device *dev, struct device_attribute *attr, char *buf) \ +{ \ -+ return sprintf (buf, format_string, dev_to_ssb_dev(dev)->field); \ ++ return sprintf(buf, format_string, dev_to_ssb_dev(dev)->field); \ +} + +ssb_config_attr(core_num, core_index, "%u\n") @@ -19,7 +19,7 @@ +static ssize_t +name_show(struct device *dev, struct device_attribute *attr, char *buf) +{ -+ return sprintf (buf, "%s\n", ssb_core_name(dev_to_ssb_dev(dev)->id.coreid)); ++ return sprintf(buf, "%s\n", ssb_core_name(dev_to_ssb_dev(dev)->id.coreid)); +} + +static struct device_attribute ssb_device_attrs[] = { diff --git a/target/linux/brcm47xx/patches-2.6.35/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-2.6.35/210-b44_phy_fix.patch index f07968a240f..a1b3224643b 100644 --- a/target/linux/brcm47xx/patches-2.6.35/210-b44_phy_fix.patch +++ b/target/linux/brcm47xx/patches-2.6.35/210-b44_phy_fix.patch @@ -67,8 +67,8 @@ { } + -+static inline void b44_bcm47xx_workarounds(struct b44 *bp) -+{ ++static inline void b44_bcm47xx_workarounds(struct b44 *bp) ++{ +} #endif diff --git a/target/linux/brcm47xx/patches-2.6.35/301-kmod-fuse-dcache-bug-r4k.patch b/target/linux/brcm47xx/patches-2.6.35/301-kmod-fuse-dcache-bug-r4k.patch index 10bf131238e..62f699298c2 100644 --- a/target/linux/brcm47xx/patches-2.6.35/301-kmod-fuse-dcache-bug-r4k.patch +++ b/target/linux/brcm47xx/patches-2.6.35/301-kmod-fuse-dcache-bug-r4k.patch @@ -18,14 +18,15 @@ unsigned long addr, unsigned long pfn) { struct flush_cache_page_args args; -@@ -1469,3 +1469,10 @@ void __cpuinit r4k_cache_init(void) +@@ -1469,3 +1469,11 @@ void __cpuinit r4k_cache_init(void) coherency_setup(); #endif } + -+// fuse package DCACHE BUG patch exports ++/* fuse package DCACHE BUG patch exports */ +void (*fuse_flush_cache_all)(void) = r4k___flush_cache_all; ++EXPORT_SYMBOL(fuse_flush_cache_all); ++ +void (*fuse_flush_cache_page)(struct vm_area_struct *vma, unsigned long page, -+ unsigned long pfn) = r4k_flush_cache_page; ++ unsigned long pfn) = r4k_flush_cache_page; +EXPORT_SYMBOL(fuse_flush_cache_page); -+EXPORT_SYMBOL(fuse_flush_cache_all); diff --git a/target/linux/brcm47xx/patches-2.6.35/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-2.6.35/400-arch-bcm47xx.patch index 722a94ba5f6..1db97e5e43a 100644 --- a/target/linux/brcm47xx/patches-2.6.35/400-arch-bcm47xx.patch +++ b/target/linux/brcm47xx/patches-2.6.35/400-arch-bcm47xx.patch @@ -1,7 +1,7 @@ --- a/arch/mips/bcm47xx/nvram.c +++ b/arch/mips/bcm47xx/nvram.c @@ -92,3 +92,30 @@ int nvram_getenv(char *name, char *val, - return 1; + return -1; } EXPORT_SYMBOL(nvram_getenv); + @@ -20,7 +20,8 @@ + end = nvram_buf + sizeof(nvram_buf) - 2; + end[0] = end[1] = '\0'; + for (; *var; var = value + strlen(value) + 1) { -+ if (!(eq = strchr(var, '='))) ++ eq = strchr(var, '='); ++ if (!eq) + break; + value = eq + 1; + if ((eq - var) == strlen(name) && strncmp(var, name, (eq - var)) == 0) @@ -29,11 +30,10 @@ + + return NULL; +} -+ +EXPORT_SYMBOL(nvram_get); --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c -@@ -236,3 +236,20 @@ void __init plat_mem_setup(void) +@@ -238,3 +238,20 @@ void __init plat_mem_setup(void) _machine_halt = bcm47xx_machine_halt; pm_power_off = bcm47xx_machine_halt; } diff --git a/target/linux/brcm47xx/patches-2.6.35/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.35/700-ssb-gigabit-ethernet-driver.patch index 5b296095a99..29b1a9da133 100644 --- a/target/linux/brcm47xx/patches-2.6.35/700-ssb-gigabit-ethernet-driver.patch +++ b/target/linux/brcm47xx/patches-2.6.35/700-ssb-gigabit-ethernet-driver.patch @@ -111,7 +111,7 @@ + if (tp->tg3_flags3 & TG3_FLG3_ROBOSWITCH) { + current_link_up = 1; -+ current_speed = SPEED_1000; //FIXME ++ current_speed = SPEED_1000; /* FIXME */ + current_duplex = DUPLEX_FULL; + tp->link_config.active_speed = current_speed; + tp->link_config.active_duplex = current_duplex; diff --git a/target/linux/brcm47xx/patches-2.6.35/920-cache-wround.patch b/target/linux/brcm47xx/patches-2.6.35/920-cache-wround.patch index b9b22256a3d..4769f2cf9fc 100644 --- a/target/linux/brcm47xx/patches-2.6.35/920-cache-wround.patch +++ b/target/linux/brcm47xx/patches-2.6.35/920-cache-wround.patch @@ -1,25 +1,28 @@ --- a/arch/mips/include/asm/r4kcache.h +++ b/arch/mips/include/asm/r4kcache.h -@@ -20,10 +20,25 @@ +@@ -20,10 +20,28 @@ #ifdef CONFIG_BCM47XX #include #include -#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE))) +#define BCM4710_DUMMY_RREG() bcm4710_dummy_rreg() + -+static inline unsigned long bcm4710_dummy_rreg(void) { -+ return (*(volatile unsigned long *)(KSEG1ADDR(SSB_ENUM_BASE))); ++static inline unsigned long bcm4710_dummy_rreg(void) ++{ ++ return *(volatile unsigned long *)(KSEG1ADDR(SSB_ENUM_BASE)); +} + -+#define BCM4710_FILL_TLB(addr) bcm4710_fill_tlb((void*)(addr)) ++#define BCM4710_FILL_TLB(addr) bcm4710_fill_tlb((void *)(addr)) + -+static inline unsigned long bcm4710_fill_tlb(void *addr) { -+ return (*(unsigned long *)addr); ++static inline unsigned long bcm4710_fill_tlb(void *addr) ++{ ++ return *(unsigned long *)addr; +} + -+#define BCM4710_PROTECTED_FILL_TLB(addr) bcm4710_protected_fill_tlb((void*)(addr)) ++#define BCM4710_PROTECTED_FILL_TLB(addr) bcm4710_protected_fill_tlb((void *)(addr)) + -+static inline void bcm4710_protected_fill_tlb(void *addr) { ++static inline void bcm4710_protected_fill_tlb(void *addr) ++{ + unsigned long x; + get_dbe(x, (unsigned long *)addr);; +} diff --git a/target/linux/brcm47xx/patches-2.6.35/950-sbb-sysfs-files.patch b/target/linux/brcm47xx/patches-2.6.35/950-sbb-sysfs-files.patch index ddb1f1b3835..021c3c890b6 100644 --- a/target/linux/brcm47xx/patches-2.6.35/950-sbb-sysfs-files.patch +++ b/target/linux/brcm47xx/patches-2.6.35/950-sbb-sysfs-files.patch @@ -8,7 +8,7 @@ +static ssize_t \ +attrib##_show(struct device *dev, struct device_attribute *attr, char *buf) \ +{ \ -+ return sprintf (buf, format_string, dev_to_ssb_dev(dev)->field); \ ++ return sprintf(buf, format_string, dev_to_ssb_dev(dev)->field); \ +} + +ssb_config_attr(core_num, core_index, "%u\n") @@ -19,7 +19,7 @@ +static ssize_t +name_show(struct device *dev, struct device_attribute *attr, char *buf) +{ -+ return sprintf (buf, "%s\n", ssb_core_name(dev_to_ssb_dev(dev)->id.coreid)); ++ return sprintf(buf, "%s\n", ssb_core_name(dev_to_ssb_dev(dev)->id.coreid)); +} + +static struct device_attribute ssb_device_attrs[] = { -- 2.30.2