diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-09-03 18:56:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:07 -0400 |
commit | 42a3b4f25af8f8d77feddf27f839fa0628dbff1a (patch) | |
tree | 332370ff3889fabb66a45fb5dcf605b142de77c8 /arch/mips/sgi-ip22 | |
parent | 875d43e72b5bf22161a81de7554f88eccf8a51ae (diff) |
[PATCH] mips: nuke trailing whitespace
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/mips/sgi-ip22')
-rw-r--r-- | arch/mips/sgi-ip22/ip22-eisa.c | 2 | ||||
-rw-r--r-- | arch/mips/sgi-ip22/ip22-hpc.c | 2 | ||||
-rw-r--r-- | arch/mips/sgi-ip22/ip22-int.c | 12 | ||||
-rw-r--r-- | arch/mips/sgi-ip22/ip22-nvram.c | 8 | ||||
-rw-r--r-- | arch/mips/sgi-ip22/ip22-reset.c | 2 | ||||
-rw-r--r-- | arch/mips/sgi-ip22/ip22-time.c | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/arch/mips/sgi-ip22/ip22-eisa.c b/arch/mips/sgi-ip22/ip22-eisa.c index 0ab4abf65d58..fa0e719c5bd1 100644 --- a/arch/mips/sgi-ip22/ip22-eisa.c +++ b/arch/mips/sgi-ip22/ip22-eisa.c | |||
@@ -242,7 +242,7 @@ int __init ip22_eisa_init(void) | |||
242 | int i, c; | 242 | int i, c; |
243 | char *str; | 243 | char *str; |
244 | u8 *slot_addr; | 244 | u8 *slot_addr; |
245 | 245 | ||
246 | if (!(sgimc->systemid & SGIMC_SYSID_EPRESENT)) { | 246 | if (!(sgimc->systemid & SGIMC_SYSID_EPRESENT)) { |
247 | printk(KERN_INFO "EISA: bus not present.\n"); | 247 | printk(KERN_INFO "EISA: bus not present.\n"); |
248 | return 1; | 248 | return 1; |
diff --git a/arch/mips/sgi-ip22/ip22-hpc.c b/arch/mips/sgi-ip22/ip22-hpc.c index c0afeccb08c4..5c00cdd20d8e 100644 --- a/arch/mips/sgi-ip22/ip22-hpc.c +++ b/arch/mips/sgi-ip22/ip22-hpc.c | |||
@@ -49,7 +49,7 @@ void __init sgihpc_init(void) | |||
49 | sgint = &sgioc->int3; | 49 | sgint = &sgioc->int3; |
50 | system_type = "SGI Indy"; | 50 | system_type = "SGI Indy"; |
51 | } | 51 | } |
52 | 52 | ||
53 | sgi_ioc_reset = (SGIOC_RESET_PPORT | SGIOC_RESET_KBDMOUSE | | 53 | sgi_ioc_reset = (SGIOC_RESET_PPORT | SGIOC_RESET_KBDMOUSE | |
54 | SGIOC_RESET_EISA | SGIOC_RESET_ISDN | | 54 | SGIOC_RESET_EISA | SGIOC_RESET_ISDN | |
55 | SGIOC_RESET_LC0OFF); | 55 | SGIOC_RESET_LC0OFF); |
diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c index ea2844d29e6e..d16fb43b1a93 100644 --- a/arch/mips/sgi-ip22/ip22-int.c +++ b/arch/mips/sgi-ip22/ip22-int.c | |||
@@ -28,7 +28,7 @@ | |||
28 | /* #define DEBUG_SGINT */ | 28 | /* #define DEBUG_SGINT */ |
29 | 29 | ||
30 | /* So far nothing hangs here */ | 30 | /* So far nothing hangs here */ |
31 | #undef USE_LIO3_IRQ | 31 | #undef USE_LIO3_IRQ |
32 | 32 | ||
33 | struct sgint_regs *sgint; | 33 | struct sgint_regs *sgint; |
34 | 34 | ||
@@ -272,32 +272,32 @@ void indy_buserror_irq(struct pt_regs *regs) | |||
272 | irq_exit(); | 272 | irq_exit(); |
273 | } | 273 | } |
274 | 274 | ||
275 | static struct irqaction local0_cascade = { | 275 | static struct irqaction local0_cascade = { |
276 | .handler = no_action, | 276 | .handler = no_action, |
277 | .flags = SA_INTERRUPT, | 277 | .flags = SA_INTERRUPT, |
278 | .name = "local0 cascade", | 278 | .name = "local0 cascade", |
279 | }; | 279 | }; |
280 | 280 | ||
281 | static struct irqaction local1_cascade = { | 281 | static struct irqaction local1_cascade = { |
282 | .handler = no_action, | 282 | .handler = no_action, |
283 | .flags = SA_INTERRUPT, | 283 | .flags = SA_INTERRUPT, |
284 | .name = "local1 cascade", | 284 | .name = "local1 cascade", |
285 | }; | 285 | }; |
286 | 286 | ||
287 | static struct irqaction buserr = { | 287 | static struct irqaction buserr = { |
288 | .handler = no_action, | 288 | .handler = no_action, |
289 | .flags = SA_INTERRUPT, | 289 | .flags = SA_INTERRUPT, |
290 | .name = "Bus Error", | 290 | .name = "Bus Error", |
291 | }; | 291 | }; |
292 | 292 | ||
293 | static struct irqaction map0_cascade = { | 293 | static struct irqaction map0_cascade = { |
294 | .handler = no_action, | 294 | .handler = no_action, |
295 | .flags = SA_INTERRUPT, | 295 | .flags = SA_INTERRUPT, |
296 | .name = "mapable0 cascade", | 296 | .name = "mapable0 cascade", |
297 | }; | 297 | }; |
298 | 298 | ||
299 | #ifdef USE_LIO3_IRQ | 299 | #ifdef USE_LIO3_IRQ |
300 | static struct irqaction map1_cascade = { | 300 | static struct irqaction map1_cascade = { |
301 | .handler = no_action, | 301 | .handler = no_action, |
302 | .flags = SA_INTERRUPT, | 302 | .flags = SA_INTERRUPT, |
303 | .name = "mapable1 cascade", | 303 | .name = "mapable1 cascade", |
diff --git a/arch/mips/sgi-ip22/ip22-nvram.c b/arch/mips/sgi-ip22/ip22-nvram.c index de43e86fa17c..fd29fd407ae8 100644 --- a/arch/mips/sgi-ip22/ip22-nvram.c +++ b/arch/mips/sgi-ip22/ip22-nvram.c | |||
@@ -39,7 +39,7 @@ | |||
39 | *ptr |= EEPROM_CSEL; \ | 39 | *ptr |= EEPROM_CSEL; \ |
40 | *ptr |= EEPROM_ECLK; }) | 40 | *ptr |= EEPROM_ECLK; }) |
41 | 41 | ||
42 | 42 | ||
43 | #define eeprom_cs_off(ptr) ({ \ | 43 | #define eeprom_cs_off(ptr) ({ \ |
44 | *ptr &= ~EEPROM_ECLK; \ | 44 | *ptr &= ~EEPROM_ECLK; \ |
45 | *ptr &= ~EEPROM_CSEL; \ | 45 | *ptr &= ~EEPROM_CSEL; \ |
@@ -50,7 +50,7 @@ | |||
50 | /* | 50 | /* |
51 | * clock in the nvram command and the register number. For the | 51 | * clock in the nvram command and the register number. For the |
52 | * national semiconductor nv ram chip the op code is 3 bits and | 52 | * national semiconductor nv ram chip the op code is 3 bits and |
53 | * the address is 6/8 bits. | 53 | * the address is 6/8 bits. |
54 | */ | 54 | */ |
55 | static inline void eeprom_cmd(volatile unsigned int *ctrl, unsigned cmd, | 55 | static inline void eeprom_cmd(volatile unsigned int *ctrl, unsigned cmd, |
56 | unsigned reg) | 56 | unsigned reg) |
@@ -90,7 +90,7 @@ unsigned short ip22_eeprom_read(volatile unsigned int *ctrl, int reg) | |||
90 | if (*ctrl & EEPROM_DATI) | 90 | if (*ctrl & EEPROM_DATI) |
91 | res |= 1; | 91 | res |= 1; |
92 | } | 92 | } |
93 | 93 | ||
94 | eeprom_cs_off(ctrl); | 94 | eeprom_cs_off(ctrl); |
95 | 95 | ||
96 | return res; | 96 | return res; |
@@ -113,7 +113,7 @@ unsigned short ip22_nvram_read(int reg) | |||
113 | reg <<= 1; | 113 | reg <<= 1; |
114 | tmp = hpc3c0->bbram[reg++] & 0xff; | 114 | tmp = hpc3c0->bbram[reg++] & 0xff; |
115 | return (tmp << 8) | (hpc3c0->bbram[reg] & 0xff); | 115 | return (tmp << 8) | (hpc3c0->bbram[reg] & 0xff); |
116 | } | 116 | } |
117 | } | 117 | } |
118 | 118 | ||
119 | EXPORT_SYMBOL(ip22_nvram_read); | 119 | EXPORT_SYMBOL(ip22_nvram_read); |
diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c index ed5c60adce63..214ffd2e98a3 100644 --- a/arch/mips/sgi-ip22/ip22-reset.c +++ b/arch/mips/sgi-ip22/ip22-reset.c | |||
@@ -185,7 +185,7 @@ static irqreturn_t panel_int(int irq, void *dev_id, struct pt_regs *regs) | |||
185 | add_timer(&debounce_timer); | 185 | add_timer(&debounce_timer); |
186 | } | 186 | } |
187 | 187 | ||
188 | /* Power button was pressed | 188 | /* Power button was pressed |
189 | * ioc.ps page 22: "The Panel Register is called Power Control by Full | 189 | * ioc.ps page 22: "The Panel Register is called Power Control by Full |
190 | * House. Only lowest 2 bits are used. Guiness uses upper four bits | 190 | * House. Only lowest 2 bits are used. Guiness uses upper four bits |
191 | * for volume control". This is not true, all bits are pulled high | 191 | * for volume control". This is not true, all bits are pulled high |
diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c index 173f76805ea3..df9b5694328a 100644 --- a/arch/mips/sgi-ip22/ip22-time.c +++ b/arch/mips/sgi-ip22/ip22-time.c | |||
@@ -126,7 +126,7 @@ static __init void indy_time_init(void) | |||
126 | unsigned long r4k_ticks[3]; | 126 | unsigned long r4k_ticks[3]; |
127 | unsigned long r4k_tick; | 127 | unsigned long r4k_tick; |
128 | 128 | ||
129 | /* | 129 | /* |
130 | * Figure out the r4k offset, the algorithm is very simple and works in | 130 | * Figure out the r4k offset, the algorithm is very simple and works in |
131 | * _all_ cases as long as the 8254 counter register itself works ok (as | 131 | * _all_ cases as long as the 8254 counter register itself works ok (as |
132 | * an interrupt driving timer it does not because of bug, this is why | 132 | * an interrupt driving timer it does not because of bug, this is why |