PPC32: update some initializers to the standard format, from Rusty.

13 files changed, 121 insertions, 121 deletions

diff --git a/arch/ppc/4xx_io/serial_sicc.c b/arch/ppc/4xx_io/serial_sicc.c
index 863dbfabc451..b1d499e965a0 100644
--- a/arch/ppc/4xx_io/serial_sicc.c
+++ b/arch/ppc/4xx_io/serial_sicc.c
@@ -343,13 +343,13 @@ static void sicc_set_mctrl_null(struct SICC_port *port, u_int mctrl)
 
 static struct SICC_port sicc_ports[SERIAL_SICC_NR] = {
     {
-        uart_base:  0,
-        uart_base_phys:  SICC0_IO_BASE,
-        irqrx:      SICC0_INTRX,
-        irqtx:      SICC0_INTTX,
-//      uartclk:    0,
-        fifosize:   1,
-        set_mctrl:  sicc_set_mctrl_null,
+        .uart_base = 0,
+        .uart_base_phys = SICC0_IO_BASE,
+        .irqrx =    SICC0_INTRX,
+        .irqtx =    SICC0_INTTX,
+//      .uartclk =    0,
+        .fifosize = 1,
+        .set_mctrl = sicc_set_mctrl_null,
     }
 };
 
@@ -2113,16 +2113,16 @@ static int __init siccuart_console_setup(struct console *co, char *options)
 
 static struct console siccuart_cons =
 {
-    name:       SERIAL_SICC_NAME,
-    write:      siccuart_console_write,
+    .name =     SERIAL_SICC_NAME,
+    .write =    siccuart_console_write,
 #ifdef used_and_not_const_char_pointer
-    read:       siccuart_console_read,
+    .read =     siccuart_console_read,
 #endif
-    device:     siccuart_console_device,
-    wait_key:   siccuart_console_wait_key,
-    setup:      siccuart_console_setup,
-    flags:      CON_PRINTBUFFER,
-    index:      -1,
+    .device =   siccuart_console_device,
+    .wait_key = siccuart_console_wait_key,
+    .setup =    siccuart_console_setup,
+    .flags =    CON_PRINTBUFFER,
+    .index =    -1,
 };
 
 void __init sicc_console_init(void)
diff --git a/arch/ppc/8260_io/uart.c b/arch/ppc/8260_io/uart.c
index 40a7e5ea6d0e..fab0ea8f1cee 100644
--- a/arch/ppc/8260_io/uart.c
+++ b/arch/ppc/8260_io/uart.c
@@ -2463,12 +2463,12 @@ static kdev_t serial_console_device(struct console *c)
 
 
 static struct console sercons = {
-	name:		"ttyS",
-	write:		serial_console_write,
-	device:		serial_console_device,
-	setup:		serial_console_setup,
-	flags:		CON_PRINTBUFFER,
-	index:		CONFIG_SERIAL_CONSOLE_PORT,
+	.name =		"ttyS",
+	.write =	serial_console_write,
+	.device =	serial_console_device,
+	.setup =	serial_console_setup,
+	.flags =	CON_PRINTBUFFER,
+	.index =	CONFIG_SERIAL_CONSOLE_PORT,
 };
 
 /*
diff --git a/arch/ppc/8xx_io/cs4218_tdm.c b/arch/ppc/8xx_io/cs4218_tdm.c
index 6b025c201bae..fda0b9fcb06d 100644
--- a/arch/ppc/8xx_io/cs4218_tdm.c
+++ b/arch/ppc/8xx_io/cs4218_tdm.c
@@ -1376,7 +1376,7 @@ static void cs_nosound(unsigned long xx)
 }
 
 static struct timer_list beep_timer = {
-	function: cs_nosound
+	.function = cs_nosound
 };
 
 static void cs_mksound(unsigned int hz, unsigned int ticks)
@@ -1468,21 +1468,21 @@ static void CS_release(void)
 }
 
 static MACHINE mach_cs4218 = {
-	name:		"HIOX CS4218",
-	name2:		"Built-in Sound",
-	open:		CS_open,
-	release:	CS_release,
-	dma_alloc:	CS_Alloc,
-	dma_free:	CS_Free,
-	irqinit:	CS_IrqInit,
+	.name =		"HIOX CS4218",
+	.name2 =	"Built-in Sound",
+	.open =		CS_open,
+	.release =	CS_release,
+	.dma_alloc =	CS_Alloc,
+	.dma_free =	CS_Free,
+	.irqinit =	CS_IrqInit,
 #ifdef MODULE
-	irqcleanup:	CS_IrqCleanup,
+	.irqcleanup =	CS_IrqCleanup,
 #endif /* MODULE */
-	init:		CS_Init,
-	silence:	CS_Silence,
-	setFormat:	CS_SetFormat,
-	setVolume:	CS_SetVolume,
-	play:		CS_Play
+	.init =		CS_Init,
+	.silence =	CS_Silence,
+	.setFormat =	CS_SetFormat,
+	.setVolume =	CS_SetVolume,
+	.play =		CS_Play
 };
 
 
@@ -1724,11 +1724,11 @@ static int mixer_ioctl(struct inode *inode, struct file *file, u_int cmd,
 
 static struct file_operations mixer_fops =
 {
-	owner:		THIS_MODULE,
-	llseek:		sound_lseek,
-	ioctl:		mixer_ioctl,
-	open:		mixer_open,
-	release:	mixer_release,
+	.owner =	THIS_MODULE,
+	.llseek =	sound_lseek,
+	.ioctl =	mixer_ioctl,
+	.open =		mixer_open,
+	.release =	mixer_release,
 };
 
 
@@ -2314,13 +2314,13 @@ static int sq_ioctl(struct inode *inode, struct file *file, u_int cmd,
 
 static struct file_operations sq_fops =
 {
-	owner:		THIS_MODULE,
-	llseek:		sound_lseek,
-	read:		sq_read,			/* sq_read */
-	write:		sq_write,
-	ioctl:		sq_ioctl,
-	open:		sq_open,
-	release:	sq_release,
+	.owner =	THIS_MODULE,
+	.llseek =	sound_lseek,
+	.read =		sq_read,			/* sq_read */
+	.write =	sq_write,
+	.ioctl =	sq_ioctl,
+	.open =		sq_open,
+	.release =	sq_release,
 };
 
 
@@ -2451,11 +2451,11 @@ static ssize_t state_read(struct file *file, char *buf, size_t count,
 
 static struct file_operations state_fops =
 {
-	owner:		THIS_MODULE,
-	llseek:		sound_lseek,
-	read:		state_read,
-	open:		state_open,
-	release:	state_release,
+	.owner =	THIS_MODULE,
+	.llseek =	sound_lseek,
+	.read =		state_read,
+	.open =		state_open,
+	.release =	state_release,
 };
 
 
diff --git a/arch/ppc/8xx_io/uart.c b/arch/ppc/8xx_io/uart.c
index 25dff6c76039..b95d60d35885 100644
--- a/arch/ppc/8xx_io/uart.c
+++ b/arch/ppc/8xx_io/uart.c
@@ -224,12 +224,12 @@ typedef struct serial_info {
 } ser_info_t;
 
 static struct console sercons = {
-	name:		"ttyS",
-	write:		serial_console_write,
-	device:		serial_console_device,
-	setup:		serial_console_setup,
-	flags:		CON_PRINTBUFFER,
-	index:		CONFIG_SERIAL_CONSOLE_PORT,
+	.name =		"ttyS",
+	.write =	serial_console_write,
+	.device =	serial_console_device,
+	.setup =	serial_console_setup,
+	.flags =	CON_PRINTBUFFER,
+	.index =	CONFIG_SERIAL_CONSOLE_PORT,
 };
 
 static void change_speed(ser_info_t *info);
diff --git a/arch/ppc/amiga/config.c b/arch/ppc/amiga/config.c
index 59bf5d52bbd5..92e09a2b10e4 100644
--- a/arch/ppc/amiga/config.c
+++ b/arch/ppc/amiga/config.c
@@ -109,9 +109,9 @@ static void amiga_heartbeat(int on);
 #endif
 
 static struct console amiga_console_driver = {
-	name:		"debug",
-	flags:		CON_PRINTBUFFER,
-	index:		-1,
+	.name =		"debug",
+	.flags =	CON_PRINTBUFFER,
+	.index =	-1,
 };
 
 
@@ -123,10 +123,10 @@ static struct {
     struct resource _ciab, _ciaa, _custom, _kickstart;
 } mb_resources = {
 //    { "Ranger Memory", 0x00c00000, 0x00c7ffff },
-    _ciab:	{ "CIA B", 0x00bfd000, 0x00bfdfff },
-    _ciaa:	{ "CIA A", 0x00bfe000, 0x00bfefff },
-    _custom:	{ "Custom I/O", 0x00dff000, 0x00dfffff },
-    _kickstart:	{ "Kickstart ROM", 0x00f80000, 0x00ffffff }
+    ._ciab =	  { "CIA B", 0x00bfd000, 0x00bfdfff },
+    ._ciaa =	  { "CIA A", 0x00bfe000, 0x00bfefff },
+    ._custom =	  { "Custom I/O", 0x00dff000, 0x00dfffff },
+    ._kickstart = { "Kickstart ROM", 0x00f80000, 0x00ffffff }
 };
 
 static struct resource rtc_resource = {
diff --git a/arch/ppc/iSeries/LparData.c b/arch/ppc/iSeries/LparData.c
index 9d0b78ad8333..1cc09f67d1c0 100644
--- a/arch/ppc/iSeries/LparData.c
+++ b/arch/ppc/iSeries/LparData.c
@@ -59,21 +59,21 @@ unsigned maxPacas = maxProcessors * 2;
 // 8192 indicates to map 8192 pages (32 MB) of the load area.
 
 struct LparMap xLparMap = { 	
-		xNumberEsids:	4,		// Number ESID/VSID pairs
-		xNumberRanges:	1,		// Number of memory ranges
-		xSegmentTableOffs:  0,		// Segment Table Page (unused)
-		xKernelEsidC:	0xC,		// ESID to map
-		xKernelVsidC:	0xCCC,		// VSID to map
-		xKernelEsidD:	0xD,		// ESID to map
-		xKernelVsidD:	0xDDD,		// VSID to map
-		xKernelEsidE:	0xE,		// ESID to map
-		xKernelVsidE:	0xEEE,		// VSID to map
-		xKernelEsidF:	0xF,		// ESID to map
-		xKernelVsidF:	0xFFF,		// VSID to map
+		.xNumberEsids =4,		// Number ESID/VSID pairs
+		.xNumberRanges =1,		// Number of memory ranges
+		.xSegmentTableOffs =0,		// Segment Table Page (unused)
+		.xKernelEsidC =0xC,		// ESID to map
+		.xKernelVsidC =0xCCC,		// VSID to map
+		.xKernelEsidD =0xD,		// ESID to map
+		.xKernelVsidD =0xDDD,		// VSID to map
+		.xKernelEsidE =0xE,		// ESID to map
+		.xKernelVsidE =0xEEE,		// VSID to map
+		.xKernelEsidF =0xF,		// ESID to map
+		.xKernelVsidF =0xFFF,		// VSID to map
 
-		xPages:		HvPagesToMap,	// # of pages to map (8192)
-		xOffset:	0,		// Offset into load area
-		xVPN:		0xCCC0000	// VPN of first mapped page
+		.xPages =		HvPagesToMap,	// # of pages to map (8192)
+		.xOffset =	0,		// Offset into load area
+		.xVPN =	0xCCC0000	// VPN of first mapped page
 };					
 
 // The Naca has a pointer to the ItVpdAreas.  The hypervisor finds
@@ -119,11 +119,11 @@ struct ItLpQueue xItLpQueue = {};
 	  (lpq),		\
 	  0, 0, {0},		\
 	  { /* LpPaca */		\
-		xDesc: 0xd397d781, /* "LpPa" */	\
-		xSize: sizeof(struct ItLpPaca),	\
-		xFPRegsInUse:	1,		\
-		xDynProcStatus: 2,		\
-		xEndOfQuantum:	0xffffffffffffffff	\
+		.xDesc = 0xd397d781, /* "LpPa" */	\
+		.xSize = sizeof(struct ItLpPaca),	\
+		.xFPRegsInUse =1,		\
+		.xDynProcStatus = 2,		\
+		.xEndOfQuantum =0xffffffffffffffff	\
 	  },			\
 	  { /* LpRegSave */	\
 		0xd397d9e2,	/* "LpRS" */	\
@@ -245,7 +245,7 @@ struct ItIplParmsReal xItIplParmsReal = {};
 
 struct IoHriProcessorVpd xIoHriProcessorVpd[maxProcessors] = {
 	{ 
-	xTimeBaseFreq: 50000000
+	.xTimeBaseFreq = 50000000
 	}
 };
 	
diff --git a/arch/ppc/iSeries/rtc.c b/arch/ppc/iSeries/rtc.c
index da4a688eddb8..6626aa8ed483 100644
--- a/arch/ppc/iSeries/rtc.c
+++ b/arch/ppc/iSeries/rtc.c
@@ -175,12 +175,12 @@ static int rtc_release(struct inode *inode, struct file *file)
  */
 
 static struct file_operations rtc_fops = {
-	owner:		THIS_MODULE,
-	llseek:		rtc_llseek,
-	read:		rtc_read,
-	ioctl:		rtc_ioctl,
-	open:		rtc_open,
-	release:	rtc_release,
+	.owner =	THIS_MODULE,
+	.llseek =	rtc_llseek,
+	.read =		rtc_read,
+	.ioctl =	rtc_ioctl,
+	.open =		rtc_open,
+	.release =	rtc_release,
 };
 
 static struct miscdevice rtc_dev=
diff --git a/arch/ppc/kernel/ppc4xx_serial.c b/arch/ppc/kernel/ppc4xx_serial.c
index 54defaf2a92c..852f81197d5d 100755
--- a/arch/ppc/kernel/ppc4xx_serial.c
+++ b/arch/ppc/kernel/ppc4xx_serial.c
@@ -166,11 +166,11 @@ ppc405_sercons_read(struct console *co, char *ptr, unsigned nb)
 }
 
 static struct console ppc405_sercons = {
-	name:		"dbg_cons",
-	write:		ppc405_console_write,
-	setup:		ppc405_console_setup,
-	flags:		CON_PRINTBUFFER,
-	index:		-1,
+	.name =		"dbg_cons",
+	.write =	ppc405_console_write,
+	.setup =	ppc405_console_setup,
+	.flags =	CON_PRINTBUFFER,
+	.index =	-1,
 };
 
 void
diff --git a/arch/ppc/kernel/ppc_htab.c b/arch/ppc/kernel/ppc_htab.c
index 61a8da7856dc..f3e6850cc081 100644
--- a/arch/ppc/kernel/ppc_htab.c
+++ b/arch/ppc/kernel/ppc_htab.c
@@ -66,9 +66,9 @@ extern unsigned int htab_hash_searches;
 #define PMC2 954
 
 struct file_operations ppc_htab_operations = {
-        llseek:         ppc_htab_lseek,
-        read:           ppc_htab_read,
-        write:          ppc_htab_write,
+        .llseek =       ppc_htab_lseek,
+        .read =         ppc_htab_read,
+        .write =        ppc_htab_write,
 };
 
 static char *pmc1_lookup(unsigned long mmcr0)
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index a397ae31150a..4add451ea75d 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -250,10 +250,10 @@ static void c_stop(struct seq_file *m, void *v)
 }
 
 struct seq_operations cpuinfo_op = {
-	start:	c_start,
-	next:	c_next,
-	stop:	c_stop,
-	show:	show_cpuinfo,
+	.start =c_start,
+	.next =	c_next,
+	.stop =	c_stop,
+	.show =	show_cpuinfo,
 };
 
 /*
diff --git a/arch/ppc/platforms/apus_setup.c b/arch/ppc/platforms/apus_setup.c
index ac452f9af536..30d1bd9c00f4 100644
--- a/arch/ppc/platforms/apus_setup.c
+++ b/arch/ppc/platforms/apus_setup.c
@@ -667,14 +667,14 @@ extern void amiga_enable_irq(unsigned int irq);
 extern void amiga_disable_irq(unsigned int irq);
 
 struct hw_interrupt_type amiga_sys_irqctrl = {
-	typename: "Amiga IPL",
-	end: apus_end_irq,
+	.typename = "Amiga IPL",
+	.end = apus_end_irq,
 };
 
 struct hw_interrupt_type amiga_irqctrl = {
-	typename: "Amiga    ",
-	enable: amiga_enable_irq,
-	disable: amiga_disable_irq,
+	.typename = "Amiga    ",
+	.enable = amiga_enable_irq,
+	.disable = amiga_disable_irq,
 };
 
 #define HARDWARE_MAPPED_SIZE (512*1024)
diff --git a/arch/ppc/platforms/proc_rtas.c b/arch/ppc/platforms/proc_rtas.c
index b893044fdb5d..5e95ad2e71b8 100644
--- a/arch/ppc/platforms/proc_rtas.c
+++ b/arch/ppc/platforms/proc_rtas.c
@@ -164,26 +164,26 @@ static ssize_t ppc_rtas_tone_volume_read(struct file * file, char * buf,
 		size_t count, loff_t *ppos);
 
 struct file_operations ppc_rtas_poweron_operations = {
-	read:		ppc_rtas_poweron_read,
-	write:		ppc_rtas_poweron_write
+	.read =		ppc_rtas_poweron_read,
+	.write =	ppc_rtas_poweron_write
 };
 struct file_operations ppc_rtas_progress_operations = {
-	read:		ppc_rtas_progress_read,
-	write:		ppc_rtas_progress_write
+	.read =		ppc_rtas_progress_read,
+	.write =	ppc_rtas_progress_write
 };
 
 struct file_operations ppc_rtas_clock_operations = {
-	read:		ppc_rtas_clock_read,
-	write:		ppc_rtas_clock_write
+	.read =		ppc_rtas_clock_read,
+	.write =	ppc_rtas_clock_write
 };
 
 struct file_operations ppc_rtas_tone_freq_operations = {
-	read:		ppc_rtas_tone_freq_read,
-	write:		ppc_rtas_tone_freq_write
+	.read =		ppc_rtas_tone_freq_read,
+	.write =	ppc_rtas_tone_freq_write
 };
 struct file_operations ppc_rtas_tone_volume_operations = {
-	read:		ppc_rtas_tone_volume_read,
-	write:		ppc_rtas_tone_volume_write
+	.read =		ppc_rtas_tone_volume_read,
+	.write =	ppc_rtas_tone_volume_write
 };
 
 int ppc_rtas_find_all_sensors (void);
diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c
index a9e26ee77058..aa33c5b1c79e 100644
--- a/arch/ppc/xmon/start.c
+++ b/arch/ppc/xmon/start.c
@@ -105,9 +105,9 @@ static void sysrq_handle_xmon(int key, struct pt_regs *regs,
 
 static struct sysrq_key_op sysrq_xmon_op = 
 {
-	handler:	sysrq_handle_xmon,
-	help_msg:	"Xmon",
-	action_msg:	"Entering xmon\n",
+	.handler =	sysrq_handle_xmon,
+	.help_msg =	"Xmon",
+	.action_msg =	"Entering xmon\n",
 };
 #endif