[ARM] Convert sa1100 PCMCIA drivers to C99 initializers (Art Haas)

The patches convert drivers/pcmcia to use C99 named initializers,
and all the patches are against 2.5.42. There are 25 patches in
total, and the "cat"ing them together they're more that 20K, so
I'm sending the patches as a compressed attachment. The patches
were CC'd to Linus in the first mail that bounced.

drivers/pcmcia/sa1100_adsbitsy.c

@@ -84,14 +84,14 @@ adsbitsy_pcmcia_configure_socket(const struct pcmcia_configure *conf)
 }
 
 static struct pcmcia_low_level adsbitsy_pcmcia_ops = {
-  init:			adsbitsy_pcmcia_init,
-  shutdown:		sa1111_pcmcia_shutdown,
-  socket_state:		sa1111_pcmcia_socket_state,
-  get_irq_info:		sa1111_pcmcia_get_irq_info,
-  configure_socket:	adsbitsy_pcmcia_configure_socket,
-
-  socket_init:		sa1111_pcmcia_socket_init,
-  socket_suspend:	sa1111_pcmcia_socket_suspend,
+  .init			= adsbitsy_pcmcia_init,
+  .shutdown		= sa1111_pcmcia_shutdown,
+  .socket_state		= sa1111_pcmcia_socket_state,
+  .get_irq_info		= sa1111_pcmcia_get_irq_info,
+  .configure_socket	= adsbitsy_pcmcia_configure_socket,
+
+  .socket_init		= sa1111_pcmcia_socket_init,
+  .socket_suspend	= sa1111_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_adsbitsy_init(void)

drivers/pcmcia/sa1100_assabet.c

@@ -192,14 +192,14 @@ static int assabet_pcmcia_socket_suspend(int sock)
 }
 
 static struct pcmcia_low_level assabet_pcmcia_ops = { 
-	init:			assabet_pcmcia_init,
-	shutdown:		assabet_pcmcia_shutdown,
-	socket_state:		assabet_pcmcia_socket_state,
-	get_irq_info:		assabet_pcmcia_get_irq_info,
-	configure_socket:	assabet_pcmcia_configure_socket,
-
-	socket_init:		assabet_pcmcia_socket_init,
-	socket_suspend:		assabet_pcmcia_socket_suspend,
+	.init			= assabet_pcmcia_init,
+	.shutdown		= assabet_pcmcia_shutdown,
+	.socket_state		= assabet_pcmcia_socket_state,
+	.get_irq_info		= assabet_pcmcia_get_irq_info,
+	.configure_socket	= assabet_pcmcia_configure_socket,
+
+	.socket_init		= assabet_pcmcia_socket_init,
+	.socket_suspend		= assabet_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_assabet_init(void)

drivers/pcmcia/sa1100_badge4.c

@@ -146,14 +146,14 @@ badge4_pcmcia_configure_socket(const struct pcmcia_configure *conf)
 }
 
 static struct pcmcia_low_level badge4_pcmcia_ops = {
-	init:			badge4_pcmcia_init,
-	shutdown:		badge4_pcmcia_shutdown,
-	socket_state:		sa1111_pcmcia_socket_state,
-	get_irq_info:		sa1111_pcmcia_get_irq_info,
-	configure_socket:	badge4_pcmcia_configure_socket,
-
-	socket_init:		sa1111_pcmcia_socket_init,
-	socket_suspend:		sa1111_pcmcia_socket_suspend,
+	.init			= badge4_pcmcia_init,
+	.shutdown		= badge4_pcmcia_shutdown,
+	.socket_state		= sa1111_pcmcia_socket_state,
+	.get_irq_info		= sa1111_pcmcia_get_irq_info,
+	.configure_socket	= badge4_pcmcia_configure_socket,
+
+	.socket_init		= sa1111_pcmcia_socket_init,
+	.socket_suspend		= sa1111_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_badge4_init(void)

drivers/pcmcia/sa1100_cerf.c

@@ -160,14 +160,14 @@ static int cerf_pcmcia_socket_suspend(int sock)
 }
 
 static struct pcmcia_low_level cerf_pcmcia_ops = { 
-  init:			cerf_pcmcia_init,
-  shutdown:		cerf_pcmcia_shutdown,
-  socket_state:		cerf_pcmcia_socket_state,
-  get_irq_info:		cerf_pcmcia_get_irq_info,
-  configure_socket:	cerf_pcmcia_configure_socket,
-
-  socket_init:		cerf_pcmcia_socket_init,
-  socket_suspend:	cerf_pcmcia_socket_suspend,
+  .init			= cerf_pcmcia_init,
+  .shutdown		= cerf_pcmcia_shutdown,
+  .socket_state		= cerf_pcmcia_socket_state,
+  .get_irq_info		= cerf_pcmcia_get_irq_info,
+  .configure_socket	= cerf_pcmcia_configure_socket,
+
+  .socket_init		= cerf_pcmcia_socket_init,
+  .socket_suspend	= cerf_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_cerf_init(void)

drivers/pcmcia/sa1100_flexanet.c

@@ -221,14 +221,14 @@ static int flexanet_pcmcia_socket_suspend(int sock)
  *
  */
 static struct pcmcia_low_level flexanet_pcmcia_ops = {
-  init:			flexanet_pcmcia_init,
-  shutdown:		flexanet_pcmcia_shutdown,
-  socket_state:		flexanet_pcmcia_socket_state,
-  get_irq_info:		flexanet_pcmcia_get_irq_info,
-  configure_socket:	flexanet_pcmcia_configure_socket,
-
-  socket_init:		flexanet_pcmcia_socket_init,
-  socket_suspend:	flexanet_pcmcia_socket_suspend,
+  .init			= flexanet_pcmcia_init,
+  .shutdown		= flexanet_pcmcia_shutdown,
+  .socket_state		= flexanet_pcmcia_socket_state,
+  .get_irq_info		= flexanet_pcmcia_get_irq_info,
+  .configure_socket	= flexanet_pcmcia_configure_socket,
+
+  .socket_init		= flexanet_pcmcia_socket_init,
+  .socket_suspend	= flexanet_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_flexanet_init(void)

drivers/pcmcia/sa1100_freebird.c

@@ -178,14 +178,14 @@ static int freebird_pcmcia_socket_suspend(int sock)
 }
 
 static struct pcmcia_low_level freebird_pcmcia_ops = {
-  init:			freebird_pcmcia_init,
-  shutdown:		freebird_pcmcia_shutdown,
-  socket_state:		freebird_pcmcia_socket_state,
-  get_irq_info:		freebird_pcmcia_get_irq_info,
-  configure_socket:	freebird_pcmcia_configure_socket,
-
-  socket_init:		freebird_pcmcia_socket_init,
-  socket_suspend:	freebird_pcmcia_socket_suspend,
+  .init			= freebird_pcmcia_init,
+  .shutdown		= freebird_pcmcia_shutdown,
+  .socket_state		= freebird_pcmcia_socket_state,
+  .get_irq_info		= freebird_pcmcia_get_irq_info,
+  .configure_socket	= freebird_pcmcia_configure_socket,
+
+  .socket_init		= freebird_pcmcia_socket_init,
+  .socket_suspend	= freebird_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_freebird_init(void)

drivers/pcmcia/sa1100_generic.c

@@ -853,19 +853,19 @@ sa1100_pcmcia_proc_setup(unsigned int sock, struct proc_dir_entry *base)
 #endif  /* defined(CONFIG_PROC_FS) */
 
 static struct pccard_operations sa1100_pcmcia_operations = {
-  init:			sa1100_pcmcia_sock_init,
-  suspend:		sa1100_pcmcia_suspend,
-  register_callback:	sa1100_pcmcia_register_callback,
-  inquire_socket:	sa1100_pcmcia_inquire_socket,
-  get_status:		sa1100_pcmcia_get_status,
-  get_socket:		sa1100_pcmcia_get_socket,
-  set_socket:		sa1100_pcmcia_set_socket,
-  get_io_map:		sa1100_pcmcia_get_io_map,
-  set_io_map:		sa1100_pcmcia_set_io_map,
-  get_mem_map:		sa1100_pcmcia_get_mem_map,
-  set_mem_map:		sa1100_pcmcia_set_mem_map,
+  .init			= sa1100_pcmcia_sock_init,
+  .suspend		= sa1100_pcmcia_suspend,
+  .register_callback	= sa1100_pcmcia_register_callback,
+  .inquire_socket	= sa1100_pcmcia_inquire_socket,
+  .get_status		= sa1100_pcmcia_get_status,
+  .get_socket		= sa1100_pcmcia_get_socket,
+  .set_socket		= sa1100_pcmcia_set_socket,
+  .get_io_map		= sa1100_pcmcia_get_io_map,
+  .set_io_map		= sa1100_pcmcia_set_io_map,
+  .get_mem_map		= sa1100_pcmcia_get_mem_map,
+  .set_mem_map		= sa1100_pcmcia_set_mem_map,
 #ifdef CONFIG_PROC_FS
-  proc_setup:		sa1100_pcmcia_proc_setup
+  .proc_setup		= sa1100_pcmcia_proc_setup
 #endif
 };
 
@@ -927,7 +927,7 @@ sa1100_pcmcia_notifier(struct notifier_block *nb, unsigned long val,
 }
 
 static struct notifier_block sa1100_pcmcia_notifier_block = {
-	notifier_call:	sa1100_pcmcia_notifier
+	.notifier_call	= sa1100_pcmcia_notifier
 };
 #endif
 

drivers/pcmcia/sa1100_graphicsclient.c

@@ -159,14 +159,14 @@ static int gcplus_pcmcia_socket_suspend(int sock)
 }
 
 static struct pcmcia_low_level gcplus_pcmcia_ops = { 
-  init:			gcplus_pcmcia_init,
-  shutdown:		gcplus_pcmcia_shutdown,
-  socket_state:		gcplus_pcmcia_socket_state,
-  get_irq_info:		gcplus_pcmcia_get_irq_info,
-  configure_socket:	gcplus_pcmcia_configure_socket,
-
-  socket_init:		gcplus_pcmcia_socket_init,
-  socket_suspend:	gcplus_pcmcia_socket_suspend,
+  .init			= gcplus_pcmcia_init,
+  .shutdown		= gcplus_pcmcia_shutdown,
+  .socket_state		= gcplus_pcmcia_socket_state,
+  .get_irq_info		= gcplus_pcmcia_get_irq_info,
+  .configure_socket	= gcplus_pcmcia_configure_socket,
+
+  .socket_init		= gcplus_pcmcia_socket_init,
+  .socket_suspend	= gcplus_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_gcplus_init(void)

drivers/pcmcia/sa1100_graphicsmaster.c

@@ -82,14 +82,14 @@ graphicsmaster_pcmcia_configure_socket(const struct pcmcia_configure *conf)
 }
 
 static struct pcmcia_low_level graphicsmaster_pcmcia_ops = {
-  init:			graphicsmaster_pcmcia_init,
-  shutdown:		sa1111_pcmcia_shutdown,
-  socket_state:		sa1111_pcmcia_socket_state,
-  get_irq_info:		sa1111_pcmcia_get_irq_info,
-  configure_socket:	graphicsmaster_pcmcia_configure_socket,
-
-  socket_init:		sa1111_pcmcia_socket_init,
-  socket_suspend:	sa1111_pcmcia_socket_suspend,
+  .init			= graphicsmaster_pcmcia_init,
+  .shutdown		= sa1111_pcmcia_shutdown,
+  .socket_state		= sa1111_pcmcia_socket_state,
+  .get_irq_info		= sa1111_pcmcia_get_irq_info,
+  .configure_socket	= graphicsmaster_pcmcia_configure_socket,
+
+  .socket_init		= sa1111_pcmcia_socket_init,
+  .socket_suspend	= sa1111_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_graphicsmaster_init(void)

drivers/pcmcia/sa1100_h3600.c

@@ -185,13 +185,13 @@ static int h3600_pcmcia_socket_suspend(int sock)
 }
 
 struct pcmcia_low_level h3600_pcmcia_ops = { 
-	init:			h3600_pcmcia_init,
-	shutdown:		h3600_pcmcia_shutdown,
-	socket_state:		h3600_pcmcia_socket_state,
-	get_irq_info:		h3600_pcmcia_get_irq_info,
-	configure_socket:	h3600_pcmcia_configure_socket,
-
-	socket_init:		h3600_pcmcia_socket_init,
-	socket_suspend:		h3600_pcmcia_socket_suspend,
+	.init			= h3600_pcmcia_init,
+	.shutdown		= h3600_pcmcia_shutdown,
+	.socket_state		= h3600_pcmcia_socket_state,
+	.get_irq_info		= h3600_pcmcia_get_irq_info,
+	.configure_socket	= h3600_pcmcia_configure_socket,
+
+	.socket_init		= h3600_pcmcia_socket_init,
+	.socket_suspend		= h3600_pcmcia_socket_suspend,
 };
 

drivers/pcmcia/sa1100_jornada720.c

@@ -97,14 +97,14 @@ printk("%s(): config socket %d vcc %d vpp %d\n", __FUNCTION__,
 }
 
 static struct pcmcia_low_level jornada720_pcmcia_ops = {
-  init:			jornada720_pcmcia_init,
-  shutdown:		sa1111_pcmcia_shutdown,
-  socket_state:		sa1111_pcmcia_socket_state,
-  get_irq_info:		sa1111_pcmcia_get_irq_info,
-  configure_socket:	jornada720_pcmcia_configure_socket,
-
-  socket_init:		sa1111_pcmcia_socket_init,
-  socket_suspend:	sa1111_pcmcia_socket_suspend,
+  .init			= jornada720_pcmcia_init,
+  .shutdown		= sa1111_pcmcia_shutdown,
+  .socket_state		= sa1111_pcmcia_socket_state,
+  .get_irq_info		= sa1111_pcmcia_get_irq_info,
+  .configure_socket	= jornada720_pcmcia_configure_socket,
+
+  .socket_init		= sa1111_pcmcia_socket_init,
+  .socket_suspend	= sa1111_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_jornada720_init(void)

drivers/pcmcia/sa1100_neponset.c

@@ -127,14 +127,14 @@ neponset_pcmcia_configure_socket(const struct pcmcia_configure *conf)
 }
 
 static struct pcmcia_low_level neponset_pcmcia_ops = {
-	init:			neponset_pcmcia_init,
-	shutdown:		sa1111_pcmcia_shutdown,
-	socket_state:		sa1111_pcmcia_socket_state,
-	get_irq_info:		sa1111_pcmcia_get_irq_info,
-	configure_socket:	neponset_pcmcia_configure_socket,
-
-	socket_init:		sa1111_pcmcia_socket_init,
-	socket_suspend:		sa1111_pcmcia_socket_suspend,
+	.init			= neponset_pcmcia_init,
+	.shutdown		= sa1111_pcmcia_shutdown,
+	.socket_state		= sa1111_pcmcia_socket_state,
+	.get_irq_info		= sa1111_pcmcia_get_irq_info,
+	.configure_socket	= neponset_pcmcia_configure_socket,
+
+	.socket_init		= sa1111_pcmcia_socket_init,
+	.socket_suspend		= sa1111_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_neponset_init(void)

drivers/pcmcia/sa1100_pangolin.c

@@ -159,13 +159,13 @@ static int pangolin_pcmcia_socket_suspend(int sock)
 }
 
 static struct pcmcia_low_level pangolin_pcmcia_ops = { 
-  init:			pangolin_pcmcia_init,
-  shutdown:		pangolin_pcmcia_shutdown,
-  socket_state:		pangolin_pcmcia_socket_state,
-  get_irq_info:		pangolin_pcmcia_get_irq_info,
-  configure_socket:	pangolin_pcmcia_configure_socket,
+  .init			= pangolin_pcmcia_init,
+  .shutdown		= pangolin_pcmcia_shutdown,
+  .socket_state		= pangolin_pcmcia_socket_state,
+  .get_irq_info		= pangolin_pcmcia_get_irq_info,
+  .configure_socket	= pangolin_pcmcia_configure_socket,
 
-  socket_init:		pangolin_pcmcia_socket_init,
+  .socket_init		= pangolin_pcmcia_socket_init,
   socket_suspend,	pangolin_pcmcia_socket_suspend,
 };
 

drivers/pcmcia/sa1100_pfs168.c

@@ -119,14 +119,14 @@ pfs168_pcmcia_configure_socket(const struct pcmcia_configure *conf)
 }
 
 static struct pcmcia_low_level pfs168_pcmcia_ops = {
-  init:			pfs168_pcmcia_init,
-  shutdown:		sa1111_pcmcia_shutdown,
-  socket_state:		sa1111_pcmcia_socket_state,
-  get_irq_info:		sa1111_pcmcia_get_irq_info,
-  configure_socket:	pfs168_pcmcia_configure_socket,
-
-  socket_init:		sa1111_pcmcia_socket_init,
-  socket_suspend:	sa1111_pcmcia_socket_suspend,
+  .init			= pfs168_pcmcia_init,
+  .shutdown		= sa1111_pcmcia_shutdown,
+  .socket_state		= sa1111_pcmcia_socket_state,
+  .get_irq_info		= sa1111_pcmcia_get_irq_info,
+  .configure_socket	= pfs168_pcmcia_configure_socket,
+
+  .socket_init		= sa1111_pcmcia_socket_init,
+  .socket_suspend	= sa1111_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_pfs168_init(void)

drivers/pcmcia/sa1100_shannon.c

@@ -151,14 +151,14 @@ static int shannon_pcmcia_socket_suspend(int sock)
 }
 
 static struct pcmcia_low_level shannon_pcmcia_ops = {
-	init:			shannon_pcmcia_init,
-	shutdown:		shannon_pcmcia_shutdown,
-	socket_state:		shannon_pcmcia_socket_state,
-	get_irq_info:		shannon_pcmcia_get_irq_info,
-	configure_socket:	shannon_pcmcia_configure_socket,
-
-	socket_init:		shannon_pcmcia_socket_init,
-	socket_suspend:		shannon_pcmcia_socket_suspend,
+	.init			= shannon_pcmcia_init,
+	.shutdown		= shannon_pcmcia_shutdown,
+	.socket_state		= shannon_pcmcia_socket_state,
+	.get_irq_info		= shannon_pcmcia_get_irq_info,
+	.configure_socket	= shannon_pcmcia_configure_socket,
+
+	.socket_init		= shannon_pcmcia_socket_init,
+	.socket_suspend		= shannon_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_shannon_init(void)

drivers/pcmcia/sa1100_simpad.c

@@ -158,14 +158,14 @@ static int simpad_pcmcia_socket_suspend(int sock)
 }
 
 static struct pcmcia_low_level simpad_pcmcia_ops = { 
-  init:			simpad_pcmcia_init,
-  shutdown:		simpad_pcmcia_shutdown,
-  socket_state:		simpad_pcmcia_socket_state,
-  get_irq_info:		simpad_pcmcia_get_irq_info,
-  configure_socket:	simpad_pcmcia_configure_socket,
-
-  socket_init:		simpad_pcmcia_socket_init,
-  socket_suspend:	simpad_pcmcia_socket_suspend,
+  .init			= simpad_pcmcia_init,
+  .shutdown		= simpad_pcmcia_shutdown,
+  .socket_state		= simpad_pcmcia_socket_state,
+  .get_irq_info		= simpad_pcmcia_get_irq_info,
+  .configure_socket	= simpad_pcmcia_configure_socket,
+
+  .socket_init		= simpad_pcmcia_socket_init,
+  .socket_suspend	= simpad_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_simpad_init(void)

drivers/pcmcia/sa1100_stork.c

@@ -227,14 +227,14 @@ static int stork_pcmcia_socket_suspend(int sock)
 }
 
 static struct pcmcia_low_level stork_pcmcia_ops = { 
-	init:			stork_pcmcia_init,
-	shutdown:		stork_pcmcia_shutdown,
-	socket_state:		stork_pcmcia_socket_state,
-	get_irq_info:		stork_pcmcia_get_irq_info,
-	configure_socket:	stork_pcmcia_configure_socket,
-
-	socket_init:		stork_pcmcia_socket_init,
-	socket_suspend:		stork_pcmcia_socket_suspend,
+	.init			= stork_pcmcia_init,
+	.shutdown		= stork_pcmcia_shutdown,
+	.socket_state		= stork_pcmcia_socket_state,
+	.get_irq_info		= stork_pcmcia_get_irq_info,
+	.configure_socket	= stork_pcmcia_configure_socket,
+
+	.socket_init		= stork_pcmcia_socket_init,
+	.socket_suspend		= stork_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_stork_init(void)

drivers/pcmcia/sa1100_system3.c

@@ -106,14 +106,14 @@ static int system3_pcmcia_socket_state(struct pcmcia_state_array
 }
 
 struct pcmcia_low_level system3_pcmcia_ops = {
-	init:				system3_pcmcia_init,
-	shutdown:			system3_pcmcia_shutdown,
-	socket_state:		system3_pcmcia_socket_state,
-	get_irq_info:		sa1111_pcmcia_get_irq_info,
-	configure_socket:	system3_pcmcia_configure_socket,
-
-	socket_init:		sa1111_pcmcia_socket_init,
-	socket_suspend:		sa1111_pcmcia_socket_suspend,
+	.init				= system3_pcmcia_init,
+	.shutdown			= system3_pcmcia_shutdown,
+	.socket_state		= system3_pcmcia_socket_state,
+	.get_irq_info		= sa1111_pcmcia_get_irq_info,
+	.configure_socket	= system3_pcmcia_configure_socket,
+
+	.socket_init		= sa1111_pcmcia_socket_init,
+	.socket_suspend		= sa1111_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_system3_init(void)

drivers/pcmcia/sa1100_trizeps.c

@@ -191,13 +191,13 @@ static int trizeps_pcmcia_socket_suspend(int sock)
  *
  ******************************************************/
 struct pcmcia_low_level trizeps_pcmcia_ops = {
-	init:			trizeps_pcmcia_init,
-	shutdown:		trizeps_pcmcia_shutdown,
-	socket_state:		trizeps_pcmcia_socket_state,
-	get_irq_info:		trizeps_pcmcia_get_irq_info,
-	configure_socket:	trizeps_pcmcia_configure_socket,
-	socket_init:		trizeps_pcmcia_socket_init,
-	socket_suspend:		trizeps_pcmcia_socket_suspend,
+	.init			= trizeps_pcmcia_init,
+	.shutdown		= trizeps_pcmcia_shutdown,
+	.socket_state		= trizeps_pcmcia_socket_state,
+	.get_irq_info		= trizeps_pcmcia_get_irq_info,
+	.configure_socket	= trizeps_pcmcia_configure_socket,
+	.socket_init		= trizeps_pcmcia_socket_init,
+	.socket_suspend		= trizeps_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_trizeps_init(void)

drivers/pcmcia/sa1100_xp860.c

@@ -132,14 +132,14 @@ xp860_pcmcia_configure_socket(const struct pcmcia_configure *conf)
 }
 
 static struct pcmcia_low_level xp860_pcmcia_ops = { 
-  init:			xp860_pcmcia_init,
-  shutdown:		sa1111_pcmcia_shutdown,
-  socket_state:		sa1111_pcmcia_socket_state,
-  get_irq_info:		sa1111_pcmcia_get_irq_info,
-  configure_socket:	xp860_pcmcia_configure_socket,
-
-  socket_init:		sa1111_pcmcia_socket_init,
-  socket_suspend:	sa1111_pcmcia_socket_suspend,
+  .init			= xp860_pcmcia_init,
+  .shutdown		= sa1111_pcmcia_shutdown,
+  .socket_state		= sa1111_pcmcia_socket_state,
+  .get_irq_info		= sa1111_pcmcia_get_irq_info,
+  .configure_socket	= xp860_pcmcia_configure_socket,
+
+  .socket_init		= sa1111_pcmcia_socket_init,
+  .socket_suspend	= sa1111_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_xp860_init(void)

drivers/pcmcia/sa1100_yopy.c

@@ -160,14 +160,14 @@ static int yopy_pcmcia_socket_suspend(int sock)
 }
 
 static struct pcmcia_low_level yopy_pcmcia_ops = {
-	init:			yopy_pcmcia_init,
-	shutdown:		yopy_pcmcia_shutdown,
-	socket_state:		yopy_pcmcia_socket_state,
-	get_irq_info:		yopy_pcmcia_get_irq_info,
-	configure_socket:	yopy_pcmcia_configure_socket,
-
-	socket_init:		yopy_pcmcia_socket_init,
-	socket_suspend:		yopy_pcmcia_socket_suspend,
+	.init			= yopy_pcmcia_init,
+	.shutdown		= yopy_pcmcia_shutdown,
+	.socket_state		= yopy_pcmcia_socket_state,
+	.get_irq_info		= yopy_pcmcia_get_irq_info,
+	.configure_socket	= yopy_pcmcia_configure_socket,
+
+	.socket_init		= yopy_pcmcia_socket_init,
+	.socket_suspend		= yopy_pcmcia_socket_suspend,
 };
 
 int __init pcmcia_yopy_init(void)