[PATCH] C99 designated initializers for arch/cris

arch/cris/drivers/axisflashmap.c

@@ -151,16 +151,16 @@ static void flash_write32(struct map_info *map, __u32 d, unsigned long adr)
 }
 
 static struct map_info axis_map = {
-	name: "Axis flash",
-	size: WINDOW_SIZE,
-	buswidth: CONFIG_ETRAX_FLASH_BUSWIDTH,
-	read8: flash_read8,
-	read16: flash_read16,
-	read32: flash_read32,
-	copy_from: flash_copy_from,
-	write8: flash_write8,
-	write16: flash_write16,
-	write32: flash_write32,
+	.name = "Axis flash",
+	.size = WINDOW_SIZE,
+	.buswidth = CONFIG_ETRAX_FLASH_BUSWIDTH,
+	.read8 = flash_read8,
+	.read16 = flash_read16,
+	.read32 = flash_read32,
+	.copy_from = flash_copy_from,
+	.write8 = flash_write8,
+	.write16 = flash_write16,
+	.write32 = flash_write32,
 };
 
 /* If no partition-table was found, we use this default-set.
@@ -175,57 +175,57 @@ static struct map_info axis_map = {
  */
 static struct mtd_partition axis_default_partitions[NUM_DEFAULT_PARTITIONS] = {
 	{
-		name: "boot firmware",
-		size: CONFIG_ETRAX_PTABLE_SECTOR,
-		offset: 0
+		.name = "boot firmware",
+		.size = CONFIG_ETRAX_PTABLE_SECTOR,
+		.offset = 0
 	},
 	{
-		name: "kernel",
-		size: 0x200000 - (6 * CONFIG_ETRAX_PTABLE_SECTOR),
-		offset: CONFIG_ETRAX_PTABLE_SECTOR
+		.name = "kernel",
+		.size = 0x200000 - (6 * CONFIG_ETRAX_PTABLE_SECTOR),
+		.offset = CONFIG_ETRAX_PTABLE_SECTOR
 	},
 	{
-		name: "filesystem",
-		size: 5 * CONFIG_ETRAX_PTABLE_SECTOR,
-		offset: 0x200000 - (5 * CONFIG_ETRAX_PTABLE_SECTOR)
+		.name = "filesystem",
+		.size = 5 * CONFIG_ETRAX_PTABLE_SECTOR,
+		.offset = 0x200000 - (5 * CONFIG_ETRAX_PTABLE_SECTOR)
 	}
 };
 
 static struct mtd_partition axis_partitions[MAX_PARTITIONS] = {
 	{
-		name: "part0",
-		size: 0,
-		offset: 0
+		.name = "part0",
+		.size = 0,
+		.offset = 0
 	},
 	{
-		name: "part1",
-		size: 0,
-		offset: 0
+		.name = "part1",
+		.size = 0,
+		.offset = 0
 	},
 	{
-		name: "part2",
-		size: 0,
-		offset: 0
+		.name = "part2",
+		.size = 0,
+		.offset = 0
 	},
 	{
-		name: "part3",
-		size: 0,
-		offset: 0
+		.name = "part3",
+		.size = 0,
+		.offset = 0
 	},
 	{
-		name: "part4",
-		size: 0,
-		offset: 0
+		.name = "part4",
+		.size = 0,
+		.offset = 0
 	},
 	{
-		name: "part5",
-		size: 0,
-		offset: 0
+		.name = "part5",
+		.size = 0,
+		.offset = 0
 	},
 	{
-		name: "part6",
-		size: 0,
-		offset: 0
+		.name = "part6",
+		.size = 0,
+		.offset = 0
 	},
 };
 

arch/cris/drivers/ds1302.c

@@ -479,8 +479,8 @@ get_rtc_status(char *buf)
 /* The various file operations we support. */
 
 static struct file_operations rtc_fops = {
-        owner:          THIS_MODULE,
-        ioctl:          rtc_ioctl,	
+        .owner          = THIS_MODULE,
+        .ioctl          = rtc_ioctl,	
 }; 
 
 /* Just probe for the RTC and register the device to handle the ioctl needed. */

arch/cris/drivers/eeprom.c

@@ -149,11 +149,11 @@ static struct eeprom_type eeprom;
 /* This is the exported file-operations structure for this device. */
 struct file_operations eeprom_fops =
 {
-  llseek:  eeprom_lseek,
-  read:    eeprom_read,
-  write:   eeprom_write,
-  open:    eeprom_open,
-  release: eeprom_close
+  .llseek  = eeprom_lseek,
+  .read    = eeprom_read,
+  .write   = eeprom_write,
+  .open    = eeprom_open,
+  .release = eeprom_close
 };
 
 /* eeprom init call. Probes for different eeprom models. */

arch/cris/drivers/gpio.c

@@ -407,12 +407,12 @@ gpio_leds_ioctl(unsigned int cmd, unsigned long arg)
 }
 
 struct file_operations gpio_fops = {
-	owner:       THIS_MODULE,
-	poll:        gpio_poll,
-	ioctl:       gpio_ioctl,
-	write:       gpio_write,
-	open:        gpio_open,
-	release:     gpio_release,
+	.owner       = THIS_MODULE,
+	.poll        = gpio_poll,
+	.ioctl       = gpio_ioctl,
+	.write       = gpio_write,
+	.open        = gpio_open,
+	.release     = gpio_release,
 };
 
 /* main driver initialization routine, called from mem.c */

arch/cris/drivers/i2c.c

@@ -654,10 +654,10 @@ i2c_ioctl(struct inode *inode, struct file *file,
 }
 
 static struct file_operations i2c_fops = {
-	owner:    THIS_MODULE,
-	ioctl:    i2c_ioctl,
-	open:     i2c_open,
-	release:  i2c_release,
+	.owner    = THIS_MODULE,
+	.ioctl    = i2c_ioctl,
+	.open     = i2c_open,
+	.release  = i2c_release,
 };
 
 static int __init

arch/cris/drivers/sync_serial.c

@@ -177,12 +177,12 @@ static unsigned gen_config_ii_shadow = 0;
 #define NUMBER_OF_PORTS (sizeof(ports)/sizeof(sync_port))
 
 static struct file_operations sync_serial_fops = {
-       owner:	THIS_MODULE,
-       write:	sync_serial_write,
-       read:	sync_serial_read,
-       ioctl:	sync_serial_ioctl,
-       open:	sync_serial_open,
-       release: sync_serial_release
+       .owner	= THIS_MODULE,
+       .write	= sync_serial_write,
+       .read	= sync_serial_read,
+       .ioctl	= sync_serial_ioctl,
+       .open	= sync_serial_open,
+       .release = sync_serial_release
 };
 
 static int __init etrax_sync_serial_init(void)

arch/cris/kernel/debugport.c

@@ -227,16 +227,16 @@ console_setup(struct console *co, char *options)
 }
 
 static struct console sercons = {
-        name:    "ttyS",
-        write:   console_write,
-        read:    NULL,
-        device:  console_device,
-        unblank: NULL,
-	setup:   console_setup,
-	flags:   CON_PRINTBUFFER,
-	index:   DEBUG_PORT_IDX,
-	cflag:   0,
-	next:    NULL
+        .name    = "ttyS",
+        .write   = console_write,
+        .read    = NULL,
+        .device  = console_device,
+        .unblank = NULL,
+	.setup   = console_setup,
+	.flags   = CON_PRINTBUFFER,
+	.index   = DEBUG_PORT_IDX,
+	.cflag   = 0,
+	.next    = NULL
 };
 
 /*

arch/cris/kernel/setup.c

@@ -280,10 +280,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,
 };
 
 #endif /* CONFIG_PROC_FS */