diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2013-01-22 06:59:30 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-02-01 04:00:22 -0500 |
commit | 7034228792cc561e79ff8600f02884bd4c80e287 (patch) | |
tree | 89b77af37d087d9de236fc5d21f60bf552d0a2c6 /arch/mips/fw | |
parent | 405ab01c70e18058d9c01a1256769a61fc65413e (diff) |
MIPS: Whitespace cleanup.
Having received another series of whitespace patches I decided to do this
once and for all rather than dealing with this kind of patches trickling
in forever.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/fw')
-rw-r--r-- | arch/mips/fw/arc/file.c | 4 | ||||
-rw-r--r-- | arch/mips/fw/arc/identify.c | 2 | ||||
-rw-r--r-- | arch/mips/fw/arc/memory.c | 2 | ||||
-rw-r--r-- | arch/mips/fw/arc/promlib.c | 2 | ||||
-rw-r--r-- | arch/mips/fw/lib/call_o32.S | 2 | ||||
-rw-r--r-- | arch/mips/fw/sni/sniprom.c | 16 |
6 files changed, 14 insertions, 14 deletions
diff --git a/arch/mips/fw/arc/file.c b/arch/mips/fw/arc/file.c index 30335341b447..a8b08032348f 100644 --- a/arch/mips/fw/arc/file.c +++ b/arch/mips/fw/arc/file.c | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | LONG | 16 | LONG |
17 | ArcGetDirectoryEntry(ULONG FileID, struct linux_vdirent *Buffer, | 17 | ArcGetDirectoryEntry(ULONG FileID, struct linux_vdirent *Buffer, |
18 | ULONG N, ULONG *Count) | 18 | ULONG N, ULONG *Count) |
19 | { | 19 | { |
20 | return ARC_CALL4(get_vdirent, FileID, Buffer, N, Count); | 20 | return ARC_CALL4(get_vdirent, FileID, Buffer, N, Count); |
21 | } | 21 | } |
@@ -69,7 +69,7 @@ ArcGetFileInformation(ULONG FileID, struct linux_finfo *Information) | |||
69 | } | 69 | } |
70 | 70 | ||
71 | LONG ArcSetFileInformation(ULONG FileID, ULONG AttributeFlags, | 71 | LONG ArcSetFileInformation(ULONG FileID, ULONG AttributeFlags, |
72 | ULONG AttributeMask) | 72 | ULONG AttributeMask) |
73 | { | 73 | { |
74 | return ARC_CALL3(set_finfo, FileID, AttributeFlags, AttributeMask); | 74 | return ARC_CALL3(set_finfo, FileID, AttributeFlags, AttributeMask); |
75 | } | 75 | } |
diff --git a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c index 54a33c756f61..f90266c02c9d 100644 --- a/arch/mips/fw/arc/identify.c +++ b/arch/mips/fw/arc/identify.c | |||
@@ -100,7 +100,7 @@ void __init prom_identify_arch(void) | |||
100 | if (p == NULL) { | 100 | if (p == NULL) { |
101 | #ifdef CONFIG_SGI_IP27 | 101 | #ifdef CONFIG_SGI_IP27 |
102 | /* IP27 PROM misbehaves, seems to not implement ARC | 102 | /* IP27 PROM misbehaves, seems to not implement ARC |
103 | GetChild(). So we just assume it's an IP27. */ | 103 | GetChild(). So we just assume it's an IP27. */ |
104 | iname = "SGI-IP27"; | 104 | iname = "SGI-IP27"; |
105 | #else | 105 | #else |
106 | iname = "Unknown"; | 106 | iname = "Unknown"; |
diff --git a/arch/mips/fw/arc/memory.c b/arch/mips/fw/arc/memory.c index 8b8eea2b6cf6..5537b94572b2 100644 --- a/arch/mips/fw/arc/memory.c +++ b/arch/mips/fw/arc/memory.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * memory.c: PROM library functions for acquiring/using memory descriptors | 2 | * memory.c: PROM library functions for acquiring/using memory descriptors |
3 | * given to us from the ARCS firmware. | 3 | * given to us from the ARCS firmware. |
4 | * | 4 | * |
5 | * Copyright (C) 1996 by David S. Miller | 5 | * Copyright (C) 1996 by David S. Miller |
6 | * Copyright (C) 1999, 2000, 2001 by Ralf Baechle | 6 | * Copyright (C) 1999, 2000, 2001 by Ralf Baechle |
diff --git a/arch/mips/fw/arc/promlib.c b/arch/mips/fw/arc/promlib.c index b7f9dd3c93c6..7e8ba5ce95be 100644 --- a/arch/mips/fw/arc/promlib.c +++ b/arch/mips/fw/arc/promlib.c | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <asm/bcache.h> | 11 | #include <asm/bcache.h> |
12 | 12 | ||
13 | /* | 13 | /* |
14 | * IP22 boardcache is not compatible with board caches. Thus we disable it | 14 | * IP22 boardcache is not compatible with board caches. Thus we disable it |
15 | * during romvec action. Since r4xx0.c is always compiled and linked with your | 15 | * during romvec action. Since r4xx0.c is always compiled and linked with your |
16 | * kernel, this shouldn't cause any harm regardless what MIPS processor you | 16 | * kernel, this shouldn't cause any harm regardless what MIPS processor you |
17 | * have. | 17 | * have. |
diff --git a/arch/mips/fw/lib/call_o32.S b/arch/mips/fw/lib/call_o32.S index e0a68713b3c3..b308b2a0613e 100644 --- a/arch/mips/fw/lib/call_o32.S +++ b/arch/mips/fw/lib/call_o32.S | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | /* Maximum number of arguments supported. Must be even! */ | 15 | /* Maximum number of arguments supported. Must be even! */ |
16 | #define O32_ARGC 32 | 16 | #define O32_ARGC 32 |
17 | /* Number of static registers we save. */ | 17 | /* Number of static registers we save. */ |
18 | #define O32_STATC 11 | 18 | #define O32_STATC 11 |
19 | /* Frame size for static register */ | 19 | /* Frame size for static register */ |
20 | #define O32_FRAMESZ (SZREG * O32_STATC) | 20 | #define O32_FRAMESZ (SZREG * O32_STATC) |
diff --git a/arch/mips/fw/sni/sniprom.c b/arch/mips/fw/sni/sniprom.c index 96ba99202758..2c2cb182af4e 100644 --- a/arch/mips/fw/sni/sniprom.c +++ b/arch/mips/fw/sni/sniprom.c | |||
@@ -28,20 +28,20 @@ | |||
28 | * registers | 28 | * registers |
29 | */ | 29 | */ |
30 | #define PROM_GET_MEMCONF 58 | 30 | #define PROM_GET_MEMCONF 58 |
31 | #define PROM_GET_HWCONF 61 | 31 | #define PROM_GET_HWCONF 61 |
32 | 32 | ||
33 | #define PROM_VEC (u64 *)CKSEG1ADDR(0x1fc00000) | 33 | #define PROM_VEC (u64 *)CKSEG1ADDR(0x1fc00000) |
34 | #define PROM_ENTRY(x) (PROM_VEC + (x)) | 34 | #define PROM_ENTRY(x) (PROM_VEC + (x)) |
35 | 35 | ||
36 | #define ___prom_putchar ((int *(*)(int))PROM_ENTRY(PROM_PUTCHAR)) | 36 | #define ___prom_putchar ((int *(*)(int))PROM_ENTRY(PROM_PUTCHAR)) |
37 | #define ___prom_getenv ((char *(*)(char *))PROM_ENTRY(PROM_GETENV)) | 37 | #define ___prom_getenv ((char *(*)(char *))PROM_ENTRY(PROM_GETENV)) |
38 | #define ___prom_get_memconf ((void (*)(void *))PROM_ENTRY(PROM_GET_MEMCONF)) | 38 | #define ___prom_get_memconf ((void (*)(void *))PROM_ENTRY(PROM_GET_MEMCONF)) |
39 | #define ___prom_get_hwconf ((u32 (*)(void))PROM_ENTRY(PROM_GET_HWCONF)) | 39 | #define ___prom_get_hwconf ((u32 (*)(void))PROM_ENTRY(PROM_GET_HWCONF)) |
40 | 40 | ||
41 | #ifdef CONFIG_64BIT | 41 | #ifdef CONFIG_64BIT |
42 | 42 | ||
43 | static u8 o32_stk[16384]; | 43 | static u8 o32_stk[16384]; |
44 | #define O32_STK &o32_stk[sizeof(o32_stk)] | 44 | #define O32_STK &o32_stk[sizeof(o32_stk)] |
45 | 45 | ||
46 | #define __PROM_O32(fun, arg) fun arg __asm__(#fun); \ | 46 | #define __PROM_O32(fun, arg) fun arg __asm__(#fun); \ |
47 | __asm__(#fun " = call_o32") | 47 | __asm__(#fun " = call_o32") |
@@ -52,13 +52,13 @@ void __PROM_O32(__prom_get_memconf, (void (*)(void *), void *, void *)); | |||
52 | u32 __PROM_O32(__prom_get_hwconf, (u32 (*)(void), void *)); | 52 | u32 __PROM_O32(__prom_get_hwconf, (u32 (*)(void), void *)); |
53 | 53 | ||
54 | #define _prom_putchar(x) __prom_putchar(___prom_putchar, O32_STK, x) | 54 | #define _prom_putchar(x) __prom_putchar(___prom_putchar, O32_STK, x) |
55 | #define _prom_getenv(x) __prom_getenv(___prom_getenv, O32_STK, x) | 55 | #define _prom_getenv(x) __prom_getenv(___prom_getenv, O32_STK, x) |
56 | #define _prom_get_memconf(x) __prom_get_memconf(___prom_get_memconf, O32_STK, x) | 56 | #define _prom_get_memconf(x) __prom_get_memconf(___prom_get_memconf, O32_STK, x) |
57 | #define _prom_get_hwconf() __prom_get_hwconf(___prom_get_hwconf, O32_STK) | 57 | #define _prom_get_hwconf() __prom_get_hwconf(___prom_get_hwconf, O32_STK) |
58 | 58 | ||
59 | #else | 59 | #else |
60 | #define _prom_putchar(x) ___prom_putchar(x) | 60 | #define _prom_putchar(x) ___prom_putchar(x) |
61 | #define _prom_getenv(x) ___prom_getenv(x) | 61 | #define _prom_getenv(x) ___prom_getenv(x) |
62 | #define _prom_get_memconf(x) ___prom_get_memconf(x) | 62 | #define _prom_get_memconf(x) ___prom_get_memconf(x) |
63 | #define _prom_get_hwconf(x) ___prom_get_hwconf(x) | 63 | #define _prom_get_hwconf(x) ___prom_get_hwconf(x) |
64 | #endif | 64 | #endif |