diff options
author | Andrew Morton <akpm@osdl.org> | 2006-01-11 15:17:49 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 21:42:14 -0500 |
commit | 8d8706e2f86d28814c1b40a116ffdeca35e4c949 (patch) | |
tree | 146567d7a807feb37a5368fbb4a6ee76d9d7bc7e /drivers/char/rio/rio_linux.h | |
parent | a9415644583ef344e02f84faf5fe24bfadb2af8e (diff) |
[PATCH] lindent rio drivers
Run all rio files through indent -kr -i8 -bri0 -l255, as requested by Alan.
rioboot.c and rioinit.c were skipped due to worrisome lindent warnings.
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/rio/rio_linux.h')
-rw-r--r-- | drivers/char/rio/rio_linux.h | 57 |
1 files changed, 28 insertions, 29 deletions
diff --git a/drivers/char/rio/rio_linux.h b/drivers/char/rio/rio_linux.h index 1fba19d5b66a..4ce77fb1fae5 100644 --- a/drivers/char/rio/rio_linux.h +++ b/drivers/char/rio/rio_linux.h | |||
@@ -37,15 +37,15 @@ | |||
37 | 37 | ||
38 | 38 | ||
39 | struct vpd_prom { | 39 | struct vpd_prom { |
40 | unsigned short id; | 40 | unsigned short id; |
41 | char hwrev; | 41 | char hwrev; |
42 | char hwass; | 42 | char hwass; |
43 | int uniqid; | 43 | int uniqid; |
44 | char myear; | 44 | char myear; |
45 | char mweek; | 45 | char mweek; |
46 | char hw_feature[5]; | 46 | char hw_feature[5]; |
47 | char oem_id; | 47 | char oem_id; |
48 | char identifier[16]; | 48 | char identifier[16]; |
49 | }; | 49 | }; |
50 | 50 | ||
51 | 51 | ||
@@ -75,13 +75,13 @@ struct vpd_prom { | |||
75 | (L_ISIG(tty))) | 75 | (L_ISIG(tty))) |
76 | 76 | ||
77 | 77 | ||
78 | #endif /* __KERNEL__ */ | 78 | #endif /* __KERNEL__ */ |
79 | 79 | ||
80 | 80 | ||
81 | #define RIO_BOARD_INTR_LOCK 1 | 81 | #define RIO_BOARD_INTR_LOCK 1 |
82 | 82 | ||
83 | 83 | ||
84 | #ifndef RIOCTL_MISC_MINOR | 84 | #ifndef RIOCTL_MISC_MINOR |
85 | /* Allow others to gather this into "major.h" or something like that */ | 85 | /* Allow others to gather this into "major.h" or something like that */ |
86 | #define RIOCTL_MISC_MINOR 169 | 86 | #define RIOCTL_MISC_MINOR 169 |
87 | #endif | 87 | #endif |
@@ -121,39 +121,39 @@ struct vpd_prom { | |||
121 | spin_unlock_irqrestore(sem, flags) | 121 | spin_unlock_irqrestore(sem, flags) |
122 | 122 | ||
123 | #define rio_spin_lock(sem) \ | 123 | #define rio_spin_lock(sem) \ |
124 | spin_lock(sem) | 124 | spin_lock(sem) |
125 | 125 | ||
126 | #define rio_spin_unlock(sem) \ | 126 | #define rio_spin_unlock(sem) \ |
127 | spin_unlock(sem) | 127 | spin_unlock(sem) |
128 | 128 | ||
129 | #endif | 129 | #endif |
130 | 130 | ||
131 | 131 | ||
132 | 132 | ||
133 | #ifdef CONFIG_RIO_OLDPCI | 133 | #ifdef CONFIG_RIO_OLDPCI |
134 | static inline void *rio_memcpy_toio (void *dummy, void *dest, void *source, int n) | 134 | static inline void *rio_memcpy_toio(void *dummy, void *dest, void *source, int n) |
135 | { | 135 | { |
136 | char *dst = dest; | 136 | char *dst = dest; |
137 | char *src = source; | 137 | char *src = source; |
138 | 138 | ||
139 | while (n--) { | 139 | while (n--) { |
140 | writeb (*src++, dst++); | 140 | writeb(*src++, dst++); |
141 | (void) readb (dummy); | 141 | (void) readb(dummy); |
142 | } | 142 | } |
143 | 143 | ||
144 | return dest; | 144 | return dest; |
145 | } | 145 | } |
146 | 146 | ||
147 | 147 | ||
148 | static inline void *rio_memcpy_fromio (void *dest, void *source, int n) | 148 | static inline void *rio_memcpy_fromio(void *dest, void *source, int n) |
149 | { | 149 | { |
150 | char *dst = dest; | 150 | char *dst = dest; |
151 | char *src = source; | 151 | char *src = source; |
152 | 152 | ||
153 | while (n--) | 153 | while (n--) |
154 | *dst++ = readb (src++); | 154 | *dst++ = readb(src++); |
155 | 155 | ||
156 | return dest; | 156 | return dest; |
157 | } | 157 | } |
158 | 158 | ||
159 | #else | 159 | #else |
@@ -179,9 +179,8 @@ static inline void *rio_memcpy_fromio (void *dest, void *source, int n) | |||
179 | #define func_exit() rio_dprintk (RIO_DEBUG_FLOW, "rio: exit %s\n", __FUNCTION__) | 179 | #define func_exit() rio_dprintk (RIO_DEBUG_FLOW, "rio: exit %s\n", __FUNCTION__) |
180 | #define func_enter2() rio_dprintk (RIO_DEBUG_FLOW, "rio: enter %s (port %d)\n",__FUNCTION__, port->line) | 180 | #define func_enter2() rio_dprintk (RIO_DEBUG_FLOW, "rio: enter %s (port %d)\n",__FUNCTION__, port->line) |
181 | #else | 181 | #else |
182 | #define rio_dprintk(f, str...) /* nothing */ | 182 | #define rio_dprintk(f, str...) /* nothing */ |
183 | #define func_enter() | 183 | #define func_enter() |
184 | #define func_exit() | 184 | #define func_exit() |
185 | #define func_enter2() | 185 | #define func_enter2() |
186 | #endif | 186 | #endif |
187 | |||