[PATCH] C99 initializers for drivers/pcmcia

4 files changed, 46 insertions, 50 deletions

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index acb7a4238c79..bee8f552a6b2 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -867,13 +867,13 @@ static int ds_ioctl(struct inode * inode, struct file * file,
 /*====================================================================*/
 
 static struct file_operations ds_fops = {
-	owner:		THIS_MODULE,
-	open:		ds_open,
-	release:	ds_release,
-	ioctl:		ds_ioctl,
-	read:		ds_read,
-	write:		ds_write,
-	poll:		ds_poll,
+	.owner		= THIS_MODULE,
+	.open		= ds_open,
+	.release	= ds_release,
+	.ioctl		= ds_ioctl,
+	.read		= ds_read,
+	.write		= ds_write,
+	.poll		= ds_poll,
 };
 
 EXPORT_SYMBOL(register_pccard_driver);
diff --git a/drivers/pcmcia/hd64465_ss.c b/drivers/pcmcia/hd64465_ss.c
index 4ce6048dceba..806f6e3531ba 100644
--- a/drivers/pcmcia/hd64465_ss.c
+++ b/drivers/pcmcia/hd64465_ss.c
@@ -240,13 +240,13 @@ static void hs_end_irq(unsigned int irq)
 
 
 static struct hw_interrupt_type hd64465_ss_irq_type = {
-	typename:	"PCMCIA-IRQ",
-	startup:	hs_startup_irq,
-	shutdown:	hs_shutdown_irq,
-	enable:		hs_enable_irq,
-	disable:	hs_disable_irq,
-	ack:		hs_mask_and_ack_irq,
-	end:		hs_end_irq
+	.typename	= "PCMCIA-IRQ",
+	.startup	= hs_startup_irq,
+	.shutdown	= hs_shutdown_irq,
+	.enable		= hs_enable_irq,
+	.disable	= hs_disable_irq,
+	.ack		= hs_mask_and_ack_irq,
+	.end		= hs_end_irq
 };
 
 /* 
diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index 153c70fc982b..cdb66c6c1832 100644
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -32,41 +32,37 @@ MODULE_LICENSE("GPL");
 /* PCI core routines */
 static struct pci_device_id i82092aa_pci_ids[] = {
 	{
-	      vendor:PCI_VENDOR_ID_INTEL,
-	      device:PCI_DEVICE_ID_INTEL_82092AA_0,
-	      subvendor:PCI_ANY_ID,
-	      subdevice:PCI_ANY_ID,
-	      class: 0, class_mask:0,
-
+	      .vendor = PCI_VENDOR_ID_INTEL,
+	      .device = PCI_DEVICE_ID_INTEL_82092AA_0,
+	      .subvendor = PCI_ANY_ID,
+	      .subdevice = PCI_ANY_ID,
 	 },
 	 {} 
 };
 MODULE_DEVICE_TABLE(pci, i82092aa_pci_ids);
 
 static struct pci_driver i82092aa_pci_drv = {
-	name:           "i82092aa",
-	id_table:       i82092aa_pci_ids,
-	probe:          i82092aa_pci_probe,
-	remove:         __devexit_p(i82092aa_pci_remove),
-	suspend:        NULL,
-	resume:         NULL 
+	.name           = "i82092aa",
+	.id_table       = i82092aa_pci_ids,
+	.probe          = i82092aa_pci_probe,
+	.remove         = __devexit_p(i82092aa_pci_remove),
 };
 
 
 /* the pccard structure and its functions */
 static struct pccard_operations i82092aa_operations = {
-	init: 		 	i82092aa_init,
-	suspend:	   	i82092aa_suspend,
-	register_callback: 	i82092aa_register_callback,
-	inquire_socket:		i82092aa_inquire_socket,   
-	get_status:		i82092aa_get_status,
-	get_socket:		i82092aa_get_socket,
-	set_socket:		i82092aa_set_socket,
-	get_io_map:		i82092aa_get_io_map,
-	set_io_map:		i82092aa_set_io_map,
-	get_mem_map:		i82092aa_get_mem_map,
-	set_mem_map:		i82092aa_set_mem_map,
-	proc_setup:		i82092aa_proc_setup,
+	.init 		 	= i82092aa_init,
+	.suspend	   	= i82092aa_suspend,
+	.register_callback 	= i82092aa_register_callback,
+	.inquire_socket		= i82092aa_inquire_socket,   
+	.get_status		= i82092aa_get_status,
+	.get_socket		= i82092aa_get_socket,
+	.set_socket		= i82092aa_set_socket,
+	.get_io_map		= i82092aa_get_io_map,
+	.set_io_map		= i82092aa_set_io_map,
+	.get_mem_map		= i82092aa_get_mem_map,
+	.set_mem_map		= i82092aa_set_mem_map,
+	.proc_setup		= i82092aa_proc_setup,
 };
 
 /* The card can do upto 4 sockets, allocate a structure for each of them */
diff --git a/drivers/pcmcia/pci_socket.c b/drivers/pcmcia/pci_socket.c
index e6297d28f83d..24ebe36c9c3f 100644
--- a/drivers/pcmcia/pci_socket.c
+++ b/drivers/pcmcia/pci_socket.c
@@ -235,24 +235,24 @@ static int cardbus_resume (struct pci_dev *dev)
 
 
 static struct pci_device_id cardbus_table [] __devinitdata = { {
-	class:		PCI_CLASS_BRIDGE_CARDBUS << 8,
-	class_mask:	~0,
+	.class		= PCI_CLASS_BRIDGE_CARDBUS << 8,
+	.class_mask	= ~0,
 
-	vendor:		PCI_ANY_ID,
-	device:		PCI_ANY_ID,
-	subvendor:	PCI_ANY_ID,
-	subdevice:	PCI_ANY_ID,
+	.vendor		= PCI_ANY_ID,
+	.device		= PCI_ANY_ID,
+	.subvendor	= PCI_ANY_ID,
+	.subdevice	= PCI_ANY_ID,
 }, { /* all zeroes */ }
 };
 MODULE_DEVICE_TABLE(pci, cardbus_table);
 
 static struct pci_driver pci_cardbus_driver = {
-	name:		"cardbus",
-	id_table:	cardbus_table,
-	probe:		cardbus_probe,
-	remove:		__devexit_p(cardbus_remove),
-	suspend:	cardbus_suspend,
-	resume:		cardbus_resume,
+	.name		= "cardbus",
+	.id_table	= cardbus_table,
+	.probe		= cardbus_probe,
+	.remove		= __devexit_p(cardbus_remove),
+	.suspend	= cardbus_suspend,
+	.resume		= cardbus_resume,
 };
 
 static int __init pci_socket_init(void)