Convert ATM drivers to use C99 struct initializers.

drivers/atm/ambassador.c

@@ -1695,12 +1695,12 @@ static int amb_proc_read (struct atm_dev * atm_dev, loff_t * pos, char * page) {
 /********** Operation Structure **********/
 
 static const struct atmdev_ops amb_ops = {
-  open:		amb_open,
-  close:	amb_close,
-  send:		amb_send,
-  sg_send:	amb_sg_send,
-  proc_read:	amb_proc_read,
-  owner:	THIS_MODULE,
+  .open	= amb_open,
+  .close	= amb_close,
+  .send	= amb_send,
+  .sg_send	= amb_sg_send,
+  .proc_read	= amb_proc_read,
+  .owner	= THIS_MODULE,
 };
 
 /********** housekeeping **********/

drivers/atm/atmtcp.c

@@ -293,13 +293,13 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
 
 
 static struct atmdev_ops atmtcp_v_dev_ops = {
-	dev_close:	atmtcp_v_dev_close,
-	open:		atmtcp_v_open,
-	close:		atmtcp_v_close,
-	ioctl:		atmtcp_v_ioctl,
-	send:		atmtcp_v_send,
-	proc_read:	atmtcp_v_proc,
-	owner:		THIS_MODULE
+	.dev_close	= atmtcp_v_dev_close,
+	.open		= atmtcp_v_open,
+	.close		= atmtcp_v_close,
+	.ioctl		= atmtcp_v_ioctl,
+	.send		= atmtcp_v_send,
+	.proc_read	= atmtcp_v_proc,
+	.owner		= THIS_MODULE
 };
 
 
@@ -309,8 +309,8 @@ static struct atmdev_ops atmtcp_v_dev_ops = {
 
 
 static struct atmdev_ops atmtcp_c_dev_ops = {
-	close:		atmtcp_c_close,
-	send:		atmtcp_c_send
+	.close		= atmtcp_c_close,
+	.send		= atmtcp_c_send
 };
 
 

drivers/atm/eni.c

@@ -2226,17 +2226,17 @@ static int eni_proc_read(struct atm_dev *dev,loff_t *pos,char *page)
 
 
 static const struct atmdev_ops ops = {
-	open:		eni_open,
-	close:		eni_close,
-	ioctl:		eni_ioctl,
-	getsockopt:	eni_getsockopt,
-	setsockopt:	eni_setsockopt,
-	send:		eni_send,
-	sg_send:	eni_sg_send,
-	phy_put:	eni_phy_put,
-	phy_get:	eni_phy_get,
-	change_qos:	eni_change_qos,
-	proc_read:	eni_proc_read
+	.open		= eni_open,
+	.close		= eni_close,
+	.ioctl		= eni_ioctl,
+	.getsockopt	= eni_getsockopt,
+	.setsockopt	= eni_setsockopt,
+	.send		= eni_send,
+	.sg_send	= eni_sg_send,
+	.phy_put	= eni_phy_put,
+	.phy_get	= eni_phy_get,
+	.change_qos	= eni_change_qos,
+	.proc_read	= eni_proc_read
 };
 
 
@@ -2306,10 +2306,10 @@ static void __devexit eni_remove_one(struct pci_dev *pci_dev)
 
 
 static struct pci_driver eni_driver = {
-	name:		DEV_LABEL,
-	id_table:	eni_pci_tbl,
-	probe:		eni_init_one,
-	remove:		__devexit_p(eni_remove_one),
+	.name		= DEV_LABEL,
+	.id_table	= eni_pci_tbl,
+	.probe		= eni_init_one,
+	.remove		= __devexit_p(eni_remove_one),
 };
 
 

drivers/atm/firestream.c

@@ -1286,11 +1286,11 @@ static int fs_change_qos(struct atm_vcc *vcc,struct atm_qos *qos,int flags)
 
 
 static const struct atmdev_ops ops = {
-	open:           fs_open,
-	close:          fs_close,
-	send:           fs_send,
+	.open =         fs_open,
+	.close =        fs_close,
+	.send =         fs_send,
 #if 0
-	owner:          THIS_MODULE,
+	.owner =        THIS_MODULE,
 #endif
 	/*                 fs_sg_send */
 	/* ioctl:          fs_ioctl, */
@@ -2099,10 +2099,10 @@ static struct pci_device_id firestream_pci_tbl[] __devinitdata = {
 MODULE_DEVICE_TABLE(pci, firestream_pci_tbl);
 
 static struct pci_driver firestream_driver = {
-	name:           "firestream",
-	id_table:       firestream_pci_tbl,
-	probe:          firestream_init_one,
-	remove:         __devexit_p(firestream_remove_one),
+	.name		= "firestream",
+	.id_table	= firestream_pci_tbl,
+	.probe		= firestream_init_one,
+	.remove		= __devexit_p(firestream_remove_one),
 };
 
 static int __init firestream_init_module (void)

drivers/atm/fore200e.c

@@ -2931,15 +2931,15 @@ module_exit(fore200e_module_cleanup);
 
 static const struct atmdev_ops fore200e_ops =
 {
-	open:         fore200e_open,
-	close:        fore200e_close,
-	ioctl:        fore200e_ioctl,
-	getsockopt:   fore200e_getsockopt,
-	setsockopt:   fore200e_setsockopt,
-	send:         fore200e_send,
-	change_qos:   fore200e_change_qos,
-	proc_read:    fore200e_proc_read,
-	owner:        THIS_MODULE,
+	.open       = fore200e_open,
+	.close      = fore200e_close,
+	.ioctl      = fore200e_ioctl,
+	.getsockopt = fore200e_getsockopt,
+	.setsockopt = fore200e_setsockopt,
+	.send       = fore200e_send,
+	.change_qos = fore200e_change_qos,
+	.proc_read  = fore200e_proc_read,
+	.owner      = THIS_MODULE,
 };
 
 

drivers/atm/horizon.c

@@ -2739,12 +2739,12 @@ static int hrz_proc_read (struct atm_dev * atm_dev, loff_t * pos, char * page) {
 }
 
 static const struct atmdev_ops hrz_ops = {
-  open:		hrz_open,
-  close:	hrz_close,
-  send:		hrz_send,
-  sg_send:	hrz_sg_send,
-  proc_read:	hrz_proc_read,
-  owner:	THIS_MODULE,
+  .open	= hrz_open,
+  .close	= hrz_close,
+  .send	= hrz_send,
+  .sg_send	= hrz_sg_send,
+  .proc_read	= hrz_proc_read,
+  .owner	= THIS_MODULE,
 };
 
 static int __init hrz_probe (void) {

drivers/atm/idt77252.c

@@ -141,15 +141,15 @@ static void idt77252_softint(void *dev_id);
 
 static struct atmdev_ops idt77252_ops =
 {
-	dev_close:	idt77252_dev_close,
-	open:		idt77252_open,
-	close:		idt77252_close,
-	send:		idt77252_send,
-	send_oam:	idt77252_send_oam,
-	phy_put:	idt77252_phy_put,
-	phy_get:	idt77252_phy_get,
-	change_qos:	idt77252_change_qos,
-	proc_read:	idt77252_proc_read
+	.dev_close	= idt77252_dev_close,
+	.open		= idt77252_open,
+	.close		= idt77252_close,
+	.send		= idt77252_send,
+	.send_oam	= idt77252_send_oam,
+	.phy_put	= idt77252_phy_put,
+	.phy_get	= idt77252_phy_get,
+	.change_qos	= idt77252_change_qos,
+	.proc_read	= idt77252_proc_read
 };
 
 static struct idt77252_dev *idt77252_chain = NULL;
@@ -3843,9 +3843,9 @@ static struct pci_device_id idt77252_pci_tbl[] __devinitdata =
 };
 
 static struct pci_driver idt77252_driver = {
-	name:		"idt77252",
-	id_table:	idt77252_pci_tbl,
-	probe:		idt77252_init_one,
+	.name		= "idt77252",
+	.id_table	= idt77252_pci_tbl,
+	.probe		= idt77252_init_one,
 };
 
 static int __init idt77252_init(void)

drivers/atm/iphase.c

@@ -3148,18 +3148,18 @@ static int ia_proc_read(struct atm_dev *dev,loff_t *pos,char *page)
 }
   
 static const struct atmdev_ops ops = {  
-	open:		ia_open,  
-	close:		ia_close,  
-	ioctl:		ia_ioctl,  
-	getsockopt:	ia_getsockopt,  
-	setsockopt:	ia_setsockopt,  
-	send:		ia_send,  
-	sg_send:	ia_sg_send,  
-	phy_put:	ia_phy_put,  
-	phy_get:	ia_phy_get,  
-	change_qos:	ia_change_qos,  
-	proc_read:	ia_proc_read,
-	owner:		THIS_MODULE,
+	.open		= ia_open,  
+	.close		= ia_close,  
+	.ioctl		= ia_ioctl,  
+	.getsockopt	= ia_getsockopt,  
+	.setsockopt	= ia_setsockopt,  
+	.send		= ia_send,  
+	.sg_send	= ia_sg_send,  
+	.phy_put	= ia_phy_put,  
+	.phy_get	= ia_phy_get,  
+	.change_qos	= ia_change_qos,  
+	.proc_read	= ia_proc_read,
+	.owner		= THIS_MODULE,
 };  
 	  
   

drivers/atm/lanai.c

@@ -2829,21 +2829,21 @@ static int lanai_proc_read(struct atm_dev *atmdev, loff_t *pos, char *page)
 /* -------------------- HOOKS: */
 
 static const struct atmdev_ops ops = {
-	dev_close:	lanai_dev_close,
-	open:		lanai_open,
-	close:		lanai_close,
-	ioctl:		lanai_ioctl,
-	getsockopt:	NULL,
-	setsockopt:	NULL,
-	send:		lanai_send,
-	sg_send:	NULL,		/* no scatter-gather on card */
-	send_oam:	NULL,		/* OAM support not in linux yet */
-	phy_put:	NULL,
-	phy_get:	NULL,
-	feedback:	NULL,
-	change_qos:	lanai_change_qos,
-	free_rx_skb:	NULL,
-	proc_read:	lanai_proc_read
+	.dev_close	= lanai_dev_close,
+	.open		= lanai_open,
+	.close		= lanai_close,
+	.ioctl		= lanai_ioctl,
+	.getsockopt	= NULL,
+	.setsockopt	= NULL,
+	.send		= lanai_send,
+	.sg_send	= NULL,		/* no scatter-gather on card */
+	.send_oam	= NULL,		/* OAM support not in linux yet */
+	.phy_put	= NULL,
+	.phy_get	= NULL,
+	.feedback	= NULL,
+	.change_qos	= lanai_change_qos,
+	.free_rx_skb	= NULL,
+	.proc_read	= lanai_proc_read
 };
 
 /* detect one type of card LANAI2 or LANAIHB */

drivers/atm/nicstar.c

@@ -259,14 +259,14 @@ static struct ns_dev *cards[NS_MAX_CARDS];
 static unsigned num_cards;
 static struct atmdev_ops atm_ops =
 {
-   open:	ns_open,
-   close:	ns_close,
-   ioctl:	ns_ioctl,
-   send:	ns_send,
-   phy_put:	ns_phy_put,
-   phy_get:	ns_phy_get,
-   proc_read:	ns_proc_read,
-   owner:	THIS_MODULE,
+   .open	= ns_open,
+   .close	= ns_close,
+   .ioctl	= ns_ioctl,
+   .send	= ns_send,
+   .phy_put	= ns_phy_put,
+   .phy_get	= ns_phy_get,
+   .proc_read	= ns_proc_read,
+   .owner	= THIS_MODULE,
 };
 static struct timer_list ns_timer;
 static char *mac[NS_MAX_CARDS];

drivers/atm/suni.c

@@ -286,10 +286,10 @@ static int suni_stop(struct atm_dev *dev)
 
 
 static const struct atmphy_ops suni_ops = {
-	start:		suni_start,
-	ioctl:		suni_ioctl,
-	interrupt:	suni_int,
-	stop:		suni_stop,
+	.start		= suni_start,
+	.ioctl		= suni_ioctl,
+	.interrupt	= suni_int,
+	.stop		= suni_stop,
 };
 
 

drivers/atm/uPD98402.c

@@ -239,10 +239,10 @@ static int uPD98402_stop(struct atm_dev *dev)
 
 
 static const struct atmphy_ops uPD98402_ops = {
-	start:		uPD98402_start,
-	ioctl:		uPD98402_ioctl,
-	interrupt:	uPD98402_int,
-	stop:		uPD98402_stop,
+	.start		= uPD98402_start,
+	.ioctl		= uPD98402_ioctl,
+	.interrupt	= uPD98402_int,
+	.stop		= uPD98402_stop,
 };
 
 

drivers/atm/zatm.c

@@ -1793,17 +1793,17 @@ static unsigned char zatm_phy_get(struct atm_dev *dev,unsigned long addr)
 
 
 static const struct atmdev_ops ops = {
-	open:		zatm_open,
-	close:		zatm_close,
-	ioctl:		zatm_ioctl,
-	getsockopt:	zatm_getsockopt,
-	setsockopt:	zatm_setsockopt,
-	send:		zatm_send,
+	.open		= zatm_open,
+	.close		= zatm_close,
+	.ioctl		= zatm_ioctl,
+	.getsockopt	= zatm_getsockopt,
+	.setsockopt	= zatm_setsockopt,
+	.send		= zatm_send,
 	/*zatm_sg_send*/
-	phy_put:	zatm_phy_put,
-	phy_get:	zatm_phy_get,
-	feedback:	zatm_feedback,
-	change_qos:	zatm_change_qos,
+	.phy_put	= zatm_phy_put,
+	.phy_get	= zatm_phy_get,
+	.feedback	= zatm_feedback,
+	.change_qos	= zatm_change_qos,
 };