diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-07-31 10:06:05 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-07-31 10:06:05 +0000 |
| commit | 3aca383c7230d72b8f8570ee9207b87ef48fcf20 (patch) | |
| tree | 4dfbcff0fae823af7165dbf76dd8117e796e7df0 /target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch | |
| parent | 96911f6b586e468d4524785a7b2e396379ff92de (diff) | |
| download | upstream-3aca383c7230d72b8f8570ee9207b87ef48fcf20.tar.gz upstream-3aca383c7230d72b8f8570ee9207b87ef48fcf20.tar.bz2 upstream-3aca383c7230d72b8f8570ee9207b87ef48fcf20.zip | |
brcm47xx: some checkpatch fixes
SVN-Revision: 22425
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch | 19 |
1 files changed, 11 insertions, 8 deletions
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 b9b22256a3..4769f2cf9f 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 <asm/paccess.h> #include <linux/ssb/ssb.h> -#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);; +} |