4 files changed, 76 insertions, 76 deletions
diff --git a/arch/mips/au1000/db1x00/mirage_ts.c b/arch/mips/au1000/db1x00/mirage_ts.c
index ade35e432004..c29852c24b4f 100644
--- a/arch/mips/au1000/db1x00/mirage_ts.c
+++ b/arch/mips/au1000/db1x00/mirage_ts.c
@@ -102,15 +102,15 @@ static struct {
 } mirage_ts_cal =
 {
 #if 0
-        xscale:   84,
+        .xscale   = 84,
-        xtrans: -157,
+        .xtrans = -157,
-        yscale:   66,
+        .yscale   = 66,
-        ytrans: -150,
+        .ytrans = -150,
 #else
-        xscale:   84,
+        .xscale   = 84,
-        xtrans: -150,
+        .xtrans = -150,
-        yscale:   66,
+        .yscale   = 66,
-        ytrans: -146,
+        .ytrans = -146,
 #endif
 };
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 13888520d41c..d1290b1ec408 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -19,66 +19,66 @@
 unsigned int vced_count, vcei_count;
 static const char *cpu_name[] = {
-        [CPU_UNKNOWN]   "unknown",
+        [CPU_UNKNOWN]   = "unknown",
-        [CPU_R2000]     "R2000",
+        [CPU_R2000]     = "R2000",
-        [CPU_R3000]     "R3000",
+        [CPU_R3000]     = "R3000",
-        [CPU_R3000A]    "R3000A",
+        [CPU_R3000A]    = "R3000A",
-        [CPU_R3041]     "R3041",
+        [CPU_R3041]     = "R3041",
-        [CPU_R3051]     "R3051",
+        [CPU_R3051]     = "R3051",
-        [CPU_R3052]     "R3052",
+        [CPU_R3052]     = "R3052",
-        [CPU_R3081]     "R3081",
+        [CPU_R3081]     = "R3081",
-        [CPU_R3081E]    "R3081E",
+        [CPU_R3081E]    = "R3081E",
-        [CPU_R4000PC]   "R4000PC",
+        [CPU_R4000PC]   = "R4000PC",
-        [CPU_R4000SC]   "R4000SC",
+        [CPU_R4000SC]   = "R4000SC",
-        [CPU_R4000MC]   "R4000MC",
+        [CPU_R4000MC]   = "R4000MC",
-        [CPU_R4200]     "R4200",
+        [CPU_R4200]     = "R4200",
-        [CPU_R4400PC]   "R4400PC",
+        [CPU_R4400PC]   = "R4400PC",
-        [CPU_R4400SC]   "R4400SC",
+        [CPU_R4400SC]   = "R4400SC",
-        [CPU_R4400MC]   "R4400MC",
+        [CPU_R4400MC]   = "R4400MC",
-        [CPU_R4600]     "R4600",
+        [CPU_R4600]     = "R4600",
-        [CPU_R6000]     "R6000",
+        [CPU_R6000]     = "R6000",
-        [CPU_R6000A]    "R6000A",
+        [CPU_R6000A]    = "R6000A",
-        [CPU_R8000]     "R8000",
+        [CPU_R8000]     = "R8000",
-        [CPU_R10000]    "R10000",
+        [CPU_R10000]    = "R10000",
-        [CPU_R12000]    "R12000",
+        [CPU_R12000]    = "R12000",
-        [CPU_R4300]     "R4300",
+        [CPU_R4300]     = "R4300",
-        [CPU_R4650]     "R4650",
+        [CPU_R4650]     = "R4650",
-        [CPU_R4700]     "R4700",
+        [CPU_R4700]     = "R4700",
-        [CPU_R5000]     "R5000",
+        [CPU_R5000]     = "R5000",
-        [CPU_R5000A]    "R5000A",
+        [CPU_R5000A]    = "R5000A",
-        [CPU_R4640]     "R4640",
+        [CPU_R4640]     = "R4640",
-        [CPU_NEVADA]    "Nevada",
+        [CPU_NEVADA]    = "Nevada",
-        [CPU_RM7000]    "RM7000",
+        [CPU_RM7000]    = "RM7000",
-        [CPU_RM9000]    "RM9000",
+        [CPU_RM9000]    = "RM9000",
-        [CPU_R5432]     "R5432",
+        [CPU_R5432]     = "R5432",
-        [CPU_4KC]       "MIPS 4Kc",
+        [CPU_4KC]       = "MIPS 4Kc",
-        [CPU_5KC]       "MIPS 5Kc",
+        [CPU_5KC]       = "MIPS 5Kc",
-        [CPU_R4310]     "R4310",
+        [CPU_R4310]     = "R4310",
-        [CPU_SB1]       "SiByte SB1",
+        [CPU_SB1]       = "SiByte SB1",
-        [CPU_TX3912]    "TX3912",
+        [CPU_TX3912]    = "TX3912",
-        [CPU_TX3922]    "TX3922",
+        [CPU_TX3922]    = "TX3922",
-        [CPU_TX3927]    "TX3927",
+        [CPU_TX3927]    = "TX3927",
-        [CPU_AU1000]    "Au1000",
+        [CPU_AU1000]    = "Au1000",
-        [CPU_AU1500]    "Au1500",
+        [CPU_AU1500]    = "Au1500",
-        [CPU_AU1100]    "Au1100",
+        [CPU_AU1100]    = "Au1100",
-        [CPU_AU1550]    "Au1550",
+        [CPU_AU1550]    = "Au1550",
-        [CPU_AU1200]    "Au1200",
+        [CPU_AU1200]    = "Au1200",
-        [CPU_4KEC]      "MIPS 4KEc",
+        [CPU_4KEC]      = "MIPS 4KEc",
-        [CPU_4KSC]      "MIPS 4KSc",
+        [CPU_4KSC]      = "MIPS 4KSc",
-        [CPU_VR41XX]    "NEC Vr41xx",
+        [CPU_VR41XX]    = "NEC Vr41xx",
-        [CPU_R5500]     "R5500",
+        [CPU_R5500]     = "R5500",
-        [CPU_TX49XX]    "TX49xx",
+        [CPU_TX49XX]    = "TX49xx",
-        [CPU_20KC]      "MIPS 20Kc",
+        [CPU_20KC]      = "MIPS 20Kc",
-        [CPU_24K]       "MIPS 24K",
+        [CPU_24K]       = "MIPS 24K",
-        [CPU_25KF]      "MIPS 25Kf",
+        [CPU_25KF]      = "MIPS 25Kf",
-        [CPU_VR4111]    "NEC VR4111",
+        [CPU_VR4111]    = "NEC VR4111",
-        [CPU_VR4121]    "NEC VR4121",
+        [CPU_VR4121]    = "NEC VR4121",
-        [CPU_VR4122]    "NEC VR4122",
+        [CPU_VR4122]    = "NEC VR4122",
-        [CPU_VR4131]    "NEC VR4131",
+        [CPU_VR4131]    = "NEC VR4131",
-        [CPU_VR4133]    "NEC VR4133",
+        [CPU_VR4133]    = "NEC VR4133",
-        [CPU_VR4181]    "NEC VR4181",
+        [CPU_VR4181]    = "NEC VR4181",
-        [CPU_VR4181A]   "NEC VR4181A",
+        [CPU_VR4181A]   = "NEC VR4181A",
-        [CPU_SR71000]   "Sandcraft SR71000"
+        [CPU_SR71000]   = "Sandcraft SR71000"
 };
diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h
index 644c085e29f3..e03cb77b131c 100644
--- a/include/asm-mips/io.h
+++ b/include/asm-mips/io.h
@@ -202,10 +202,10 @@ extern unsigned long isa_slot_offset;
 */
 #define page_to_phys(page)      ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT)
-extern void * __ioremap(phys_t offset, phys_t size, unsigned long flags);
+extern void __iomem * __ioremap(phys_t offset, phys_t size, unsigned long flags);
 extern void __iounmap(volatile void __iomem *addr);
-static inline void * __ioremap_mode(phys_t offset, unsigned long size,
+static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size,
        unsigned long flags)
 {
        if (cpu_has_64bit_addresses) {
diff --git a/include/asm-mips/serial.h b/include/asm-mips/serial.h
index 780197abb8ff..ce1043530e59 100644
--- a/include/asm-mips/serial.h
+++ b/include/asm-mips/serial.h
@@ -217,9 +217,9 @@
 #define JAGUAR_ATX_SERIAL1_BASE 0xfd000023L
 #define _JAGUAR_ATX_SERIAL_INIT(int, base)                              \
-        { baud_base: JAGUAR_ATX_BASE_BAUD, irq: int,                    \
+        { .baud_base = JAGUAR_ATX_BASE_BAUD, irq: int,                  \
-          flags: (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST),               \
+          .flags = (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST),             \
-          iomem_base: (u8 *) base, iomem_reg_shift: 2,                  \
+          .iomem_base = (u8 *) base, iomem_reg_shift: 2,                        \
          io_type: SERIAL_IO_MEM }
 #define MOMENCO_JAGUAR_ATX_SERIAL_PORT_DEFNS                            \
        _JAGUAR_ATX_SERIAL_INIT(JAGUAR_ATX_SERIAL1_IRQ, JAGUAR_ATX_SERIAL1_BASE)
@@ -233,9 +233,9 @@
 #define OCELOT_3_SERIAL_BASE    (signed)0xfd000020
 #define _OCELOT_3_SERIAL_INIT(int, base)                                \
-        { baud_base: OCELOT_3_BASE_BAUD, irq: int,                      \
+        { .baud_base = OCELOT_3_BASE_BAUD, irq: int,                    \
-          flags: STD_COM_FLAGS,                                         \
+          .flags = STD_COM_FLAGS,                                               \
-          iomem_base: (u8 *) base, iomem_reg_shift: 2,                  \
+          .iomem_base = (u8 *) base, iomem_reg_shift: 2,                        \
          io_type: SERIAL_IO_MEM }
 #define MOMENCO_OCELOT_3_SERIAL_PORT_DEFNS                              \

diff --git a/arch/mips/au1000/db1x00/mirage_ts.c b/arch/mips/au1000/db1x00/mirage_ts.c index ade35e432004..c29852c24b4f 100644 --- a/arch/mips/au1000/db1x00/mirage_ts.c +++ b/arch/mips/au1000/db1x00/mirage_ts.c
@@ -102,15 +102,15 @@ static struct {
102	} mirage_ts_cal =	102	} mirage_ts_cal =
103	{	103	{
104	#if 0	104	#if 0
105	xscale: 84,	105	.xscale = 84,
106	xtrans: -157,	106	.xtrans = -157,
107	yscale: 66,	107	.yscale = 66,
108	ytrans: -150,	108	.ytrans = -150,
109	#else	109	#else
110	xscale: 84,	110	.xscale = 84,
111	xtrans: -150,	111	.xtrans = -150,
112	yscale: 66,	112	.yscale = 66,
113	ytrans: -146,	113	.ytrans = -146,
114	#endif	114	#endif
115	};	115	};
116		116


diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c index 13888520d41c..d1290b1ec408 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c
@@ -19,66 +19,66 @@
19	unsigned int vced_count, vcei_count;	19	unsigned int vced_count, vcei_count;
20		20
21	static const char *cpu_name[] = {	21	static const char *cpu_name[] = {
22	[CPU_UNKNOWN] "unknown",	22	[CPU_UNKNOWN] = "unknown",
23	[CPU_R2000] "R2000",	23	[CPU_R2000] = "R2000",
24	[CPU_R3000] "R3000",	24	[CPU_R3000] = "R3000",
25	[CPU_R3000A] "R3000A",	25	[CPU_R3000A] = "R3000A",
26	[CPU_R3041] "R3041",	26	[CPU_R3041] = "R3041",
27	[CPU_R3051] "R3051",	27	[CPU_R3051] = "R3051",
28	[CPU_R3052] "R3052",	28	[CPU_R3052] = "R3052",
29	[CPU_R3081] "R3081",	29	[CPU_R3081] = "R3081",
30	[CPU_R3081E] "R3081E",	30	[CPU_R3081E] = "R3081E",
31	[CPU_R4000PC] "R4000PC",	31	[CPU_R4000PC] = "R4000PC",
32	[CPU_R4000SC] "R4000SC",	32	[CPU_R4000SC] = "R4000SC",
33	[CPU_R4000MC] "R4000MC",	33	[CPU_R4000MC] = "R4000MC",
34	[CPU_R4200] "R4200",	34	[CPU_R4200] = "R4200",
35	[CPU_R4400PC] "R4400PC",	35	[CPU_R4400PC] = "R4400PC",
36	[CPU_R4400SC] "R4400SC",	36	[CPU_R4400SC] = "R4400SC",
37	[CPU_R4400MC] "R4400MC",	37	[CPU_R4400MC] = "R4400MC",
38	[CPU_R4600] "R4600",	38	[CPU_R4600] = "R4600",
39	[CPU_R6000] "R6000",	39	[CPU_R6000] = "R6000",
40	[CPU_R6000A] "R6000A",	40	[CPU_R6000A] = "R6000A",
41	[CPU_R8000] "R8000",	41	[CPU_R8000] = "R8000",
42	[CPU_R10000] "R10000",	42	[CPU_R10000] = "R10000",
43	[CPU_R12000] "R12000",	43	[CPU_R12000] = "R12000",
44	[CPU_R4300] "R4300",	44	[CPU_R4300] = "R4300",
45	[CPU_R4650] "R4650",	45	[CPU_R4650] = "R4650",
46	[CPU_R4700] "R4700",	46	[CPU_R4700] = "R4700",
47	[CPU_R5000] "R5000",	47	[CPU_R5000] = "R5000",
48	[CPU_R5000A] "R5000A",	48	[CPU_R5000A] = "R5000A",
49	[CPU_R4640] "R4640",	49	[CPU_R4640] = "R4640",
50	[CPU_NEVADA] "Nevada",	50	[CPU_NEVADA] = "Nevada",
51	[CPU_RM7000] "RM7000",	51	[CPU_RM7000] = "RM7000",
52	[CPU_RM9000] "RM9000",	52	[CPU_RM9000] = "RM9000",
53	[CPU_R5432] "R5432",	53	[CPU_R5432] = "R5432",
54	[CPU_4KC] "MIPS 4Kc",	54	[CPU_4KC] = "MIPS 4Kc",
55	[CPU_5KC] "MIPS 5Kc",	55	[CPU_5KC] = "MIPS 5Kc",
56	[CPU_R4310] "R4310",	56	[CPU_R4310] = "R4310",
57	[CPU_SB1] "SiByte SB1",	57	[CPU_SB1] = "SiByte SB1",
58	[CPU_TX3912] "TX3912",	58	[CPU_TX3912] = "TX3912",
59	[CPU_TX3922] "TX3922",	59	[CPU_TX3922] = "TX3922",
60	[CPU_TX3927] "TX3927",	60	[CPU_TX3927] = "TX3927",
61	[CPU_AU1000] "Au1000",	61	[CPU_AU1000] = "Au1000",
62	[CPU_AU1500] "Au1500",	62	[CPU_AU1500] = "Au1500",
63	[CPU_AU1100] "Au1100",	63	[CPU_AU1100] = "Au1100",
64	[CPU_AU1550] "Au1550",	64	[CPU_AU1550] = "Au1550",
65	[CPU_AU1200] "Au1200",	65	[CPU_AU1200] = "Au1200",
66	[CPU_4KEC] "MIPS 4KEc",	66	[CPU_4KEC] = "MIPS 4KEc",
67	[CPU_4KSC] "MIPS 4KSc",	67	[CPU_4KSC] = "MIPS 4KSc",
68	[CPU_VR41XX] "NEC Vr41xx",	68	[CPU_VR41XX] = "NEC Vr41xx",
69	[CPU_R5500] "R5500",	69	[CPU_R5500] = "R5500",
70	[CPU_TX49XX] "TX49xx",	70	[CPU_TX49XX] = "TX49xx",
71	[CPU_20KC] "MIPS 20Kc",	71	[CPU_20KC] = "MIPS 20Kc",
72	[CPU_24K] "MIPS 24K",	72	[CPU_24K] = "MIPS 24K",
73	[CPU_25KF] "MIPS 25Kf",	73	[CPU_25KF] = "MIPS 25Kf",
74	[CPU_VR4111] "NEC VR4111",	74	[CPU_VR4111] = "NEC VR4111",
75	[CPU_VR4121] "NEC VR4121",	75	[CPU_VR4121] = "NEC VR4121",
76	[CPU_VR4122] "NEC VR4122",	76	[CPU_VR4122] = "NEC VR4122",
77	[CPU_VR4131] "NEC VR4131",	77	[CPU_VR4131] = "NEC VR4131",
78	[CPU_VR4133] "NEC VR4133",	78	[CPU_VR4133] = "NEC VR4133",
79	[CPU_VR4181] "NEC VR4181",	79	[CPU_VR4181] = "NEC VR4181",
80	[CPU_VR4181A] "NEC VR4181A",	80	[CPU_VR4181A] = "NEC VR4181A",
81	[CPU_SR71000] "Sandcraft SR71000"	81	[CPU_SR71000] = "Sandcraft SR71000"
82	};	82	};
83		83
84		84


diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h index 644c085e29f3..e03cb77b131c 100644 --- a/include/asm-mips/io.h +++ b/include/asm-mips/io.h
@@ -202,10 +202,10 @@ extern unsigned long isa_slot_offset;
202	*/	202	*/
203	#define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT)	203	#define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT)
204		204
205	extern void * __ioremap(phys_t offset, phys_t size, unsigned long flags);	205	extern void __iomem * __ioremap(phys_t offset, phys_t size, unsigned long flags);
206	extern void __iounmap(volatile void __iomem *addr);	206	extern void __iounmap(volatile void __iomem *addr);
207		207
208	static inline void * __ioremap_mode(phys_t offset, unsigned long size,	208	static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size,
209	unsigned long flags)	209	unsigned long flags)
210	{	210	{
211	if (cpu_has_64bit_addresses) {	211	if (cpu_has_64bit_addresses) {


diff --git a/include/asm-mips/serial.h b/include/asm-mips/serial.h index 780197abb8ff..ce1043530e59 100644 --- a/include/asm-mips/serial.h +++ b/include/asm-mips/serial.h
@@ -217,9 +217,9 @@
217	#define JAGUAR_ATX_SERIAL1_BASE 0xfd000023L	217	#define JAGUAR_ATX_SERIAL1_BASE 0xfd000023L
218		218
219	#define _JAGUAR_ATX_SERIAL_INIT(int, base) \	219	#define _JAGUAR_ATX_SERIAL_INIT(int, base) \
220	{ baud_base: JAGUAR_ATX_BASE_BAUD, irq: int, \	220	{ .baud_base = JAGUAR_ATX_BASE_BAUD, irq: int, \
221	flags: (ASYNC_BOOT_AUTOCONF \| ASYNC_SKIP_TEST), \	221	.flags = (ASYNC_BOOT_AUTOCONF \| ASYNC_SKIP_TEST), \
222	iomem_base: (u8 *) base, iomem_reg_shift: 2, \	222	.iomem_base = (u8 *) base, iomem_reg_shift: 2, \
223	io_type: SERIAL_IO_MEM }	223	io_type: SERIAL_IO_MEM }
224	#define MOMENCO_JAGUAR_ATX_SERIAL_PORT_DEFNS \	224	#define MOMENCO_JAGUAR_ATX_SERIAL_PORT_DEFNS \
225	_JAGUAR_ATX_SERIAL_INIT(JAGUAR_ATX_SERIAL1_IRQ, JAGUAR_ATX_SERIAL1_BASE)	225	_JAGUAR_ATX_SERIAL_INIT(JAGUAR_ATX_SERIAL1_IRQ, JAGUAR_ATX_SERIAL1_BASE)
@@ -233,9 +233,9 @@
233	#define OCELOT_3_SERIAL_BASE (signed)0xfd000020	233	#define OCELOT_3_SERIAL_BASE (signed)0xfd000020
234		234
235	#define _OCELOT_3_SERIAL_INIT(int, base) \	235	#define _OCELOT_3_SERIAL_INIT(int, base) \
236	{ baud_base: OCELOT_3_BASE_BAUD, irq: int, \	236	{ .baud_base = OCELOT_3_BASE_BAUD, irq: int, \
237	flags: STD_COM_FLAGS, \	237	.flags = STD_COM_FLAGS, \
238	iomem_base: (u8 *) base, iomem_reg_shift: 2, \	238	.iomem_base = (u8 *) base, iomem_reg_shift: 2, \
239	io_type: SERIAL_IO_MEM }	239	io_type: SERIAL_IO_MEM }
240		240
241	#define MOMENCO_OCELOT_3_SERIAL_PORT_DEFNS \	241	#define MOMENCO_OCELOT_3_SERIAL_PORT_DEFNS \