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/txx9/generic | |
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/txx9/generic')
-rw-r--r-- | arch/mips/txx9/generic/irq_tx4927.c | 2 | ||||
-rw-r--r-- | arch/mips/txx9/generic/irq_tx4939.c | 4 | ||||
-rw-r--r-- | arch/mips/txx9/generic/mem_tx4927.c | 2 | ||||
-rw-r--r-- | arch/mips/txx9/generic/pci.c | 4 | ||||
-rw-r--r-- | arch/mips/txx9/generic/setup_tx3927.c | 2 | ||||
-rw-r--r-- | arch/mips/txx9/generic/setup_tx4927.c | 2 | ||||
-rw-r--r-- | arch/mips/txx9/generic/setup_tx4938.c | 2 | ||||
-rw-r--r-- | arch/mips/txx9/generic/setup_tx4939.c | 4 | ||||
-rw-r--r-- | arch/mips/txx9/generic/smsc_fdc37m81x.c | 48 |
9 files changed, 35 insertions, 35 deletions
diff --git a/arch/mips/txx9/generic/irq_tx4927.c b/arch/mips/txx9/generic/irq_tx4927.c index 7e3ac5782da4..ed8e702d448e 100644 --- a/arch/mips/txx9/generic/irq_tx4927.c +++ b/arch/mips/txx9/generic/irq_tx4927.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * Common tx4927 irq handler | 2 | * Common tx4927 irq handler |
3 | * | 3 | * |
4 | * Author: MontaVista Software, Inc. | 4 | * Author: MontaVista Software, Inc. |
5 | * source@mvista.com | 5 | * source@mvista.com |
6 | * | 6 | * |
7 | * under the terms of the GNU General Public License as published by the | 7 | * under the terms of the GNU General Public License as published by the |
8 | * Free Software Foundation; either version 2 of the License, or (at your | 8 | * Free Software Foundation; either version 2 of the License, or (at your |
diff --git a/arch/mips/txx9/generic/irq_tx4939.c b/arch/mips/txx9/generic/irq_tx4939.c index 6b067dbd2ae1..0d7267e81a8c 100644 --- a/arch/mips/txx9/generic/irq_tx4939.c +++ b/arch/mips/txx9/generic/irq_tx4939.c | |||
@@ -5,8 +5,8 @@ | |||
5 | * | 5 | * |
6 | * Copyright 2001, 2003-2005 MontaVista Software Inc. | 6 | * Copyright 2001, 2003-2005 MontaVista Software Inc. |
7 | * Author: MontaVista Software, Inc. | 7 | * Author: MontaVista Software, Inc. |
8 | * ahennessy@mvista.com | 8 | * ahennessy@mvista.com |
9 | * source@mvista.com | 9 | * source@mvista.com |
10 | * Copyright (C) 2000-2001,2005-2007 Toshiba Corporation | 10 | * Copyright (C) 2000-2001,2005-2007 Toshiba Corporation |
11 | * | 11 | * |
12 | * This file is subject to the terms and conditions of the GNU General Public | 12 | * This file is subject to the terms and conditions of the GNU General Public |
diff --git a/arch/mips/txx9/generic/mem_tx4927.c b/arch/mips/txx9/generic/mem_tx4927.c index 70f9626f8227..deea2ceae8a7 100644 --- a/arch/mips/txx9/generic/mem_tx4927.c +++ b/arch/mips/txx9/generic/mem_tx4927.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * common tx4927 memory interface | 2 | * common tx4927 memory interface |
3 | * | 3 | * |
4 | * Author: MontaVista Software, Inc. | 4 | * Author: MontaVista Software, Inc. |
5 | * source@mvista.com | 5 | * source@mvista.com |
6 | * | 6 | * |
7 | * Copyright 2001-2002 MontaVista Software Inc. | 7 | * Copyright 2001-2002 MontaVista Software Inc. |
8 | * | 8 | * |
diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c index ce8f8b9b930c..28713274e0cc 100644 --- a/arch/mips/txx9/generic/pci.c +++ b/arch/mips/txx9/generic/pci.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * linux/arch/mips/txx9/pci.c | 2 | * linux/arch/mips/txx9/pci.c |
3 | * | 3 | * |
4 | * Based on linux/arch/mips/txx9/rbtx4927/setup.c, | 4 | * Based on linux/arch/mips/txx9/rbtx4927/setup.c, |
5 | * linux/arch/mips/txx9/rbtx4938/setup.c, | 5 | * linux/arch/mips/txx9/rbtx4938/setup.c, |
6 | * and RBTX49xx patch from CELF patch archive. | 6 | * and RBTX49xx patch from CELF patch archive. |
7 | * | 7 | * |
8 | * Copyright 2001-2005 MontaVista Software Inc. | 8 | * Copyright 2001-2005 MontaVista Software Inc. |
@@ -107,7 +107,7 @@ int txx9_pci_mem_high __initdata; | |||
107 | 107 | ||
108 | /* | 108 | /* |
109 | * allocate pci_controller and resources. | 109 | * allocate pci_controller and resources. |
110 | * mem_base, io_base: physical address. 0 for auto assignment. | 110 | * mem_base, io_base: physical address. 0 for auto assignment. |
111 | * mem_size and io_size means max size on auto assignment. | 111 | * mem_size and io_size means max size on auto assignment. |
112 | * pcic must be &txx9_primary_pcic or NULL. | 112 | * pcic must be &txx9_primary_pcic or NULL. |
113 | */ | 113 | */ |
diff --git a/arch/mips/txx9/generic/setup_tx3927.c b/arch/mips/txx9/generic/setup_tx3927.c index 9505d58454c8..110e05c3eb8f 100644 --- a/arch/mips/txx9/generic/setup_tx3927.c +++ b/arch/mips/txx9/generic/setup_tx3927.c | |||
@@ -132,6 +132,6 @@ void __init tx3927_mtd_init(int ch) | |||
132 | unsigned long size = txx9_ce_res[ch].end - start + 1; | 132 | unsigned long size = txx9_ce_res[ch].end - start + 1; |
133 | 133 | ||
134 | if (!(tx3927_romcptr->cr[ch] & 0x8)) | 134 | if (!(tx3927_romcptr->cr[ch] & 0x8)) |
135 | return; /* disabled */ | 135 | return; /* disabled */ |
136 | txx9_physmap_flash_init(ch, start, size, &pdata); | 136 | txx9_physmap_flash_init(ch, start, size, &pdata); |
137 | } | 137 | } |
diff --git a/arch/mips/txx9/generic/setup_tx4927.c b/arch/mips/txx9/generic/setup_tx4927.c index 3418b2a90f7e..e714d6ce9a82 100644 --- a/arch/mips/txx9/generic/setup_tx4927.c +++ b/arch/mips/txx9/generic/setup_tx4927.c | |||
@@ -250,7 +250,7 @@ void __init tx4927_mtd_init(int ch) | |||
250 | unsigned long size = txx9_ce_res[ch].end - start + 1; | 250 | unsigned long size = txx9_ce_res[ch].end - start + 1; |
251 | 251 | ||
252 | if (!(TX4927_EBUSC_CR(ch) & 0x8)) | 252 | if (!(TX4927_EBUSC_CR(ch) & 0x8)) |
253 | return; /* disabled */ | 253 | return; /* disabled */ |
254 | txx9_physmap_flash_init(ch, start, size, &pdata); | 254 | txx9_physmap_flash_init(ch, start, size, &pdata); |
255 | } | 255 | } |
256 | 256 | ||
diff --git a/arch/mips/txx9/generic/setup_tx4938.c b/arch/mips/txx9/generic/setup_tx4938.c index eb2080110239..0a3bf2dfaba1 100644 --- a/arch/mips/txx9/generic/setup_tx4938.c +++ b/arch/mips/txx9/generic/setup_tx4938.c | |||
@@ -329,7 +329,7 @@ void __init tx4938_mtd_init(int ch) | |||
329 | unsigned long size = txx9_ce_res[ch].end - start + 1; | 329 | unsigned long size = txx9_ce_res[ch].end - start + 1; |
330 | 330 | ||
331 | if (!(TX4938_EBUSC_CR(ch) & 0x8)) | 331 | if (!(TX4938_EBUSC_CR(ch) & 0x8)) |
332 | return; /* disabled */ | 332 | return; /* disabled */ |
333 | txx9_physmap_flash_init(ch, start, size, &pdata); | 333 | txx9_physmap_flash_init(ch, start, size, &pdata); |
334 | } | 334 | } |
335 | 335 | ||
diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c index 5ff7a9584daf..729a50991780 100644 --- a/arch/mips/txx9/generic/setup_tx4939.c +++ b/arch/mips/txx9/generic/setup_tx4939.c | |||
@@ -301,7 +301,7 @@ void __init tx4939_sio_init(unsigned int sclk, unsigned int cts_mask) | |||
301 | unsigned int ch_mask = 0; | 301 | unsigned int ch_mask = 0; |
302 | __u64 pcfg = __raw_readq(&tx4939_ccfgptr->pcfg); | 302 | __u64 pcfg = __raw_readq(&tx4939_ccfgptr->pcfg); |
303 | 303 | ||
304 | cts_mask |= ~1; /* only SIO0 have RTS/CTS */ | 304 | cts_mask |= ~1; /* only SIO0 have RTS/CTS */ |
305 | if ((pcfg & TX4939_PCFG_SIO2MODE_MASK) != TX4939_PCFG_SIO2MODE_SIO0) | 305 | if ((pcfg & TX4939_PCFG_SIO2MODE_MASK) != TX4939_PCFG_SIO2MODE_SIO0) |
306 | cts_mask |= 1 << 0; /* disable SIO0 RTS/CTS by PCFG setting */ | 306 | cts_mask |= 1 << 0; /* disable SIO0 RTS/CTS by PCFG setting */ |
307 | if ((pcfg & TX4939_PCFG_SIO2MODE_MASK) != TX4939_PCFG_SIO2MODE_SIO2) | 307 | if ((pcfg & TX4939_PCFG_SIO2MODE_MASK) != TX4939_PCFG_SIO2MODE_SIO2) |
@@ -378,7 +378,7 @@ void __init tx4939_mtd_init(int ch) | |||
378 | unsigned long size = txx9_ce_res[ch].end - start + 1; | 378 | unsigned long size = txx9_ce_res[ch].end - start + 1; |
379 | 379 | ||
380 | if (!(TX4939_EBUSC_CR(ch) & 0x8)) | 380 | if (!(TX4939_EBUSC_CR(ch) & 0x8)) |
381 | return; /* disabled */ | 381 | return; /* disabled */ |
382 | txx9_physmap_flash_init(ch, start, size, &pdata); | 382 | txx9_physmap_flash_init(ch, start, size, &pdata); |
383 | } | 383 | } |
384 | 384 | ||
diff --git a/arch/mips/txx9/generic/smsc_fdc37m81x.c b/arch/mips/txx9/generic/smsc_fdc37m81x.c index 8ebc3848f3ac..f98baa6263d2 100644 --- a/arch/mips/txx9/generic/smsc_fdc37m81x.c +++ b/arch/mips/txx9/generic/smsc_fdc37m81x.c | |||
@@ -18,40 +18,40 @@ | |||
18 | /* Common Registers */ | 18 | /* Common Registers */ |
19 | #define SMSC_FDC37M81X_CONFIG_INDEX 0x00 | 19 | #define SMSC_FDC37M81X_CONFIG_INDEX 0x00 |
20 | #define SMSC_FDC37M81X_CONFIG_DATA 0x01 | 20 | #define SMSC_FDC37M81X_CONFIG_DATA 0x01 |
21 | #define SMSC_FDC37M81X_CONF 0x02 | 21 | #define SMSC_FDC37M81X_CONF 0x02 |
22 | #define SMSC_FDC37M81X_INDEX 0x03 | 22 | #define SMSC_FDC37M81X_INDEX 0x03 |
23 | #define SMSC_FDC37M81X_DNUM 0x07 | 23 | #define SMSC_FDC37M81X_DNUM 0x07 |
24 | #define SMSC_FDC37M81X_DID 0x20 | 24 | #define SMSC_FDC37M81X_DID 0x20 |
25 | #define SMSC_FDC37M81X_DREV 0x21 | 25 | #define SMSC_FDC37M81X_DREV 0x21 |
26 | #define SMSC_FDC37M81X_PCNT 0x22 | 26 | #define SMSC_FDC37M81X_PCNT 0x22 |
27 | #define SMSC_FDC37M81X_PMGT 0x23 | 27 | #define SMSC_FDC37M81X_PMGT 0x23 |
28 | #define SMSC_FDC37M81X_OSC 0x24 | 28 | #define SMSC_FDC37M81X_OSC 0x24 |
29 | #define SMSC_FDC37M81X_CONFPA0 0x26 | 29 | #define SMSC_FDC37M81X_CONFPA0 0x26 |
30 | #define SMSC_FDC37M81X_CONFPA1 0x27 | 30 | #define SMSC_FDC37M81X_CONFPA1 0x27 |
31 | #define SMSC_FDC37M81X_TEST4 0x2B | 31 | #define SMSC_FDC37M81X_TEST4 0x2B |
32 | #define SMSC_FDC37M81X_TEST5 0x2C | 32 | #define SMSC_FDC37M81X_TEST5 0x2C |
33 | #define SMSC_FDC37M81X_TEST1 0x2D | 33 | #define SMSC_FDC37M81X_TEST1 0x2D |
34 | #define SMSC_FDC37M81X_TEST2 0x2E | 34 | #define SMSC_FDC37M81X_TEST2 0x2E |
35 | #define SMSC_FDC37M81X_TEST3 0x2F | 35 | #define SMSC_FDC37M81X_TEST3 0x2F |
36 | 36 | ||
37 | /* Logical device numbers */ | 37 | /* Logical device numbers */ |
38 | #define SMSC_FDC37M81X_FDD 0x00 | 38 | #define SMSC_FDC37M81X_FDD 0x00 |
39 | #define SMSC_FDC37M81X_SERIAL1 0x04 | 39 | #define SMSC_FDC37M81X_SERIAL1 0x04 |
40 | #define SMSC_FDC37M81X_SERIAL2 0x05 | 40 | #define SMSC_FDC37M81X_SERIAL2 0x05 |
41 | #define SMSC_FDC37M81X_KBD 0x07 | 41 | #define SMSC_FDC37M81X_KBD 0x07 |
42 | 42 | ||
43 | /* Logical device Config Registers */ | 43 | /* Logical device Config Registers */ |
44 | #define SMSC_FDC37M81X_ACTIVE 0x30 | 44 | #define SMSC_FDC37M81X_ACTIVE 0x30 |
45 | #define SMSC_FDC37M81X_BASEADDR0 0x60 | 45 | #define SMSC_FDC37M81X_BASEADDR0 0x60 |
46 | #define SMSC_FDC37M81X_BASEADDR1 0x61 | 46 | #define SMSC_FDC37M81X_BASEADDR1 0x61 |
47 | #define SMSC_FDC37M81X_INT 0x70 | 47 | #define SMSC_FDC37M81X_INT 0x70 |
48 | #define SMSC_FDC37M81X_INT2 0x72 | 48 | #define SMSC_FDC37M81X_INT2 0x72 |
49 | #define SMSC_FDC37M81X_MODE 0xF0 | 49 | #define SMSC_FDC37M81X_MODE 0xF0 |
50 | 50 | ||
51 | /* Chip Config Values */ | 51 | /* Chip Config Values */ |
52 | #define SMSC_FDC37M81X_CONFIG_ENTER 0x55 | 52 | #define SMSC_FDC37M81X_CONFIG_ENTER 0x55 |
53 | #define SMSC_FDC37M81X_CONFIG_EXIT 0xaa | 53 | #define SMSC_FDC37M81X_CONFIG_EXIT 0xaa |
54 | #define SMSC_FDC37M81X_CHIP_ID 0x4d | 54 | #define SMSC_FDC37M81X_CHIP_ID 0x4d |
55 | 55 | ||
56 | static unsigned long g_smsc_fdc37m81x_base; | 56 | static unsigned long g_smsc_fdc37m81x_base; |
57 | 57 | ||