[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.

diff --git a/drivers/pcmcia/sa1100_adsbitsy.c b/drivers/pcmcia/sa1100_adsbitsy.c
index 202524e4c354d9328c095557cc753836b2195eba..a7f533ca5c05d7a6e52ec18a1c53a48339aa4ab6 100644 (file)
--- a/drivers/pcmcia/sa1100_adsbitsy.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_assabet.c b/drivers/pcmcia/sa1100_assabet.c
index eb883f64e239fd8a51e0a89a0948104ab274e6bf..12e56888eaac8e1a5cf7eb4754ced4791da9bec6 100644 (file)
--- a/drivers/pcmcia/sa1100_assabet.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_badge4.c b/drivers/pcmcia/sa1100_badge4.c
index 77174645d6c1155d38d6478624d3e30f0758f0ae..255872d64f10ade93d849c56c4ca1c3790068815 100644 (file)
--- a/drivers/pcmcia/sa1100_badge4.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_cerf.c b/drivers/pcmcia/sa1100_cerf.c
index f3142cea6deb6e6b10ae0a78d3350f0399d9b634..c4b6746c1b57d7fbb1aa48ec651a78ea0b3204cc 100644 (file)
--- a/drivers/pcmcia/sa1100_cerf.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_flexanet.c b/drivers/pcmcia/sa1100_flexanet.c
index edb8c9c029cf079c337285c0a8e22decb06ddabb..069193424a68b3d2bd9fc80b5306406bfce4025c 100644 (file)
--- a/drivers/pcmcia/sa1100_flexanet.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_freebird.c b/drivers/pcmcia/sa1100_freebird.c
index 99cbb28a0e66ec511f01184dcdc8ec53a613b59b..00cedaeffcaa6be9c275758f0ffa24b4c2119250 100644 (file)
--- a/drivers/pcmcia/sa1100_freebird.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
index a31365bb73fe601e45a54f8df5b81ebfe3d44531..517bf8bbbb317bc7530881bbcb39b91f48e8c937 100644 (file)
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/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
 

diff --git a/drivers/pcmcia/sa1100_graphicsclient.c b/drivers/pcmcia/sa1100_graphicsclient.c
index 6a3691df82efa26e4001b72e5d23add2f56e0bdf..6633941bdf2e85bd51ca6c618b898692c928fe55 100644 (file)
--- a/drivers/pcmcia/sa1100_graphicsclient.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_graphicsmaster.c b/drivers/pcmcia/sa1100_graphicsmaster.c
index 9552dfa55816753ff20d1f0571df12cf1f438035..34ca7f1442019f544e02585d24729c5e04eaebea 100644 (file)
--- a/drivers/pcmcia/sa1100_graphicsmaster.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_h3600.c b/drivers/pcmcia/sa1100_h3600.c
index b9310ea18e51be920eae6973e74ab35c4d787399..a557d496f8468f8515d9f022797ed8df8bd4b88e 100644 (file)
--- a/drivers/pcmcia/sa1100_h3600.c
+++ b/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,
 };
 

diff --git a/drivers/pcmcia/sa1100_jornada720.c b/drivers/pcmcia/sa1100_jornada720.c
index d15f51eedba68bbfda2a974b4b9f76ced133fc5c..2563902ec01a136467b8a7182de720e7e494197d 100644 (file)
--- a/drivers/pcmcia/sa1100_jornada720.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_neponset.c b/drivers/pcmcia/sa1100_neponset.c
index 12d6c5c662f967f3d9431970ee92a64477c1cb91..c9a37dd4bcce5cc49e324c82de0fdc07e072945e 100644 (file)
--- a/drivers/pcmcia/sa1100_neponset.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_pangolin.c b/drivers/pcmcia/sa1100_pangolin.c
index 35455466f8f7ac2f310ef7fc35998d9765ff8cf7..32a24fcb86cf3f21f5a71a9bf0e3994ac673c3bd 100644 (file)
--- a/drivers/pcmcia/sa1100_pangolin.c
+++ b/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,
 };
 

diff --git a/drivers/pcmcia/sa1100_pfs168.c b/drivers/pcmcia/sa1100_pfs168.c
index 511afebb38a38dad07d00e47cd92829bbcbcf134..770132ee9fc2c81f9a778817c4a8b93b64c2b06a 100644 (file)
--- a/drivers/pcmcia/sa1100_pfs168.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_shannon.c b/drivers/pcmcia/sa1100_shannon.c
index 7cfe0105a22593f726f0b526194a6dbb0808dde1..df6897ed6fb0042dc8624d961c8319372d819fa8 100644 (file)
--- a/drivers/pcmcia/sa1100_shannon.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c
index bbe79bdf8fc18fe9722c8f08a18429a526772abd..637a65a246a35ad822345bbab1d544a07303ef30 100644 (file)
--- a/drivers/pcmcia/sa1100_simpad.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_stork.c b/drivers/pcmcia/sa1100_stork.c
index c172acce8305fae6655d1af476dff4326d75e900..63c59ebb458a0815b8de28e365c295b0208a3e6d 100644 (file)
--- a/drivers/pcmcia/sa1100_stork.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_system3.c b/drivers/pcmcia/sa1100_system3.c
index 2ab0d4537d0dcd8227dd6e8e73e3bd050a156cfa..c6076fee5bcb2fece202af91803602fa5927117b 100644 (file)
--- a/drivers/pcmcia/sa1100_system3.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_trizeps.c b/drivers/pcmcia/sa1100_trizeps.c
index c06a041bac8c1948456bb760bc94ed5a2a4f162d..96a4df935c2d7c6e9ca25572f1ba3d257f8c354b 100644 (file)
--- a/drivers/pcmcia/sa1100_trizeps.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_xp860.c b/drivers/pcmcia/sa1100_xp860.c
index 69d3f3ddaaccefb7f43bab5d4e257ad83d3c2b74..c1eb6ae182498cc0eaee6c3eae305f08b038deca 100644 (file)
--- a/drivers/pcmcia/sa1100_xp860.c
+++ b/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)

diff --git a/drivers/pcmcia/sa1100_yopy.c b/drivers/pcmcia/sa1100_yopy.c
index 4bdb837cd6f1840efd36206229ce0207ebd93879..dc4dbc76889af434a50600886fc02cc9e58b0fde 100644 (file)
--- a/drivers/pcmcia/sa1100_yopy.c
+++ b/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)