Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  smc91c92_cs.c: fix bogus compiler warning
  orinoco_cs: be more careful when matching cards with ID 0x0156:0x0002
  hostap_cs: support cards with "Version 01.02" as third product ID
  pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3
  pxa2xx pcmcia - stargate 2 use gpio array.
  pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.
  drivers:pcmcia:soc_common: make socket_init and socket_suspend optional

11 files changed, 15 insertions, 122 deletions

diff --git a/drivers/pcmcia/pxa2xx_balloon3.c b/drivers/pcmcia/pxa2xx_balloon3.c
index 4c3e94c0ae85..f56d7de7c751 100644
--- a/drivers/pcmcia/pxa2xx_balloon3.c
+++ b/drivers/pcmcia/pxa2xx_balloon3.c
@@ -103,22 +103,12 @@ static int balloon3_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
         return 0;
 }
 
-static void balloon3_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
-{
-}
-
-static void balloon3_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
-{
-}
-
 static struct pcmcia_low_level balloon3_pcmcia_ops = {
         .owner                  = THIS_MODULE,
         .hw_init                = balloon3_pcmcia_hw_init,
         .hw_shutdown            = balloon3_pcmcia_hw_shutdown,
         .socket_state           = balloon3_pcmcia_socket_state,
         .configure_socket       = balloon3_pcmcia_configure_socket,
-        .socket_init            = balloon3_pcmcia_socket_init,
-        .socket_suspend         = balloon3_pcmcia_socket_suspend,
         .first                  = 0,
         .nr                     = 1,
 };
diff --git a/drivers/pcmcia/pxa2xx_cm_x255.c b/drivers/pcmcia/pxa2xx_cm_x255.c
index 05913d0bbdbe..63f4d5211ed2 100644
--- a/drivers/pcmcia/pxa2xx_cm_x255.c
+++ b/drivers/pcmcia/pxa2xx_cm_x255.c
@@ -102,23 +102,12 @@ static int cmx255_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
         return 0;
 }
 
-static void cmx255_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
-{
-}
-
-static void cmx255_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
-{
-}
-
-
 static struct pcmcia_low_level cmx255_pcmcia_ops __initdata = {
         .owner                  = THIS_MODULE,
         .hw_init                = cmx255_pcmcia_hw_init,
         .hw_shutdown            = cmx255_pcmcia_shutdown,
         .socket_state           = cmx255_pcmcia_socket_state,
         .configure_socket       = cmx255_pcmcia_configure_socket,
-        .socket_init            = cmx255_pcmcia_socket_init,
-        .socket_suspend         = cmx255_pcmcia_socket_suspend,
         .nr                     = 1,
 };
 
diff --git a/drivers/pcmcia/pxa2xx_cm_x270.c b/drivers/pcmcia/pxa2xx_cm_x270.c
index 5662646b84da..6ee42b4c3e68 100644
--- a/drivers/pcmcia/pxa2xx_cm_x270.c
+++ b/drivers/pcmcia/pxa2xx_cm_x270.c
@@ -82,23 +82,12 @@ static int cmx270_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
         return 0;
 }
 
-static void cmx270_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
-{
-}
-
-static void cmx270_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
-{
-}
-
-
 static struct pcmcia_low_level cmx270_pcmcia_ops __initdata = {
         .owner                  = THIS_MODULE,
         .hw_init                = cmx270_pcmcia_hw_init,
         .hw_shutdown            = cmx270_pcmcia_shutdown,
         .socket_state           = cmx270_pcmcia_socket_state,
         .configure_socket       = cmx270_pcmcia_configure_socket,
-        .socket_init            = cmx270_pcmcia_socket_init,
-        .socket_suspend         = cmx270_pcmcia_socket_suspend,
         .nr                     = 1,
 };
 
diff --git a/drivers/pcmcia/pxa2xx_colibri.c b/drivers/pcmcia/pxa2xx_colibri.c
index 443cb7fc872d..c6dec572a05d 100644
--- a/drivers/pcmcia/pxa2xx_colibri.c
+++ b/drivers/pcmcia/pxa2xx_colibri.c
@@ -116,14 +116,6 @@ colibri_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
         return 0;
 }
 
-static void colibri_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
-{
-}
-
-static void colibri_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
-{
-}
-
 static struct pcmcia_low_level colibri_pcmcia_ops = {
         .owner                  = THIS_MODULE,
 
@@ -135,9 +127,6 @@ static struct pcmcia_low_level colibri_pcmcia_ops = {
 
         .socket_state           = colibri_pcmcia_socket_state,
         .configure_socket       = colibri_pcmcia_configure_socket,
-
-        .socket_init            = colibri_pcmcia_socket_init,
-        .socket_suspend         = colibri_pcmcia_socket_suspend,
 };
 
 static struct platform_device *colibri_pcmcia_device;
diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c
index 92016fe932b4..aded706c0b9f 100644
--- a/drivers/pcmcia/pxa2xx_mainstone.c
+++ b/drivers/pcmcia/pxa2xx_mainstone.c
@@ -128,22 +128,12 @@ static int mst_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
         return ret;
 }
 
-static void mst_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
-{
-}
-
-static void mst_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
-{
-}
-
 static struct pcmcia_low_level mst_pcmcia_ops __initdata = {
         .owner                  = THIS_MODULE,
         .hw_init                = mst_pcmcia_hw_init,
         .hw_shutdown            = mst_pcmcia_hw_shutdown,
         .socket_state           = mst_pcmcia_socket_state,
         .configure_socket       = mst_pcmcia_configure_socket,
-        .socket_init            = mst_pcmcia_socket_init,
-        .socket_suspend         = mst_pcmcia_socket_suspend,
         .nr                     = 2,
 };
 
diff --git a/drivers/pcmcia/pxa2xx_palmld.c b/drivers/pcmcia/pxa2xx_palmld.c
index 69f73670949a..d589ad1dcd4c 100644
--- a/drivers/pcmcia/pxa2xx_palmld.c
+++ b/drivers/pcmcia/pxa2xx_palmld.c
@@ -65,14 +65,6 @@ static int palmld_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
         return 0;
 }
 
-static void palmld_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
-{
-}
-
-static void palmld_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
-{
-}
-
 static struct pcmcia_low_level palmld_pcmcia_ops = {
         .owner                  = THIS_MODULE,
 
@@ -84,9 +76,6 @@ static struct pcmcia_low_level palmld_pcmcia_ops = {
 
         .socket_state           = palmld_pcmcia_socket_state,
         .configure_socket       = palmld_pcmcia_configure_socket,
-
-        .socket_init            = palmld_pcmcia_socket_init,
-        .socket_suspend         = palmld_pcmcia_socket_suspend,
 };
 
 static struct platform_device *palmld_pcmcia_device;
diff --git a/drivers/pcmcia/pxa2xx_palmtc.c b/drivers/pcmcia/pxa2xx_palmtc.c
index d0ad6a76bbde..9c6a04b2f71b 100644
--- a/drivers/pcmcia/pxa2xx_palmtc.c
+++ b/drivers/pcmcia/pxa2xx_palmtc.c
@@ -117,14 +117,6 @@ static int palmtc_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
         return ret;
 }
 
-static void palmtc_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
-{
-}
-
-static void palmtc_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
-{
-}
-
 static struct pcmcia_low_level palmtc_pcmcia_ops = {
         .owner                  = THIS_MODULE,
 
@@ -136,9 +128,6 @@ static struct pcmcia_low_level palmtc_pcmcia_ops = {
 
         .socket_state           = palmtc_pcmcia_socket_state,
         .configure_socket       = palmtc_pcmcia_configure_socket,
-
-        .socket_init            = palmtc_pcmcia_socket_init,
-        .socket_suspend         = palmtc_pcmcia_socket_suspend,
 };
 
 static struct platform_device *palmtc_pcmcia_device;
diff --git a/drivers/pcmcia/pxa2xx_palmtx.c b/drivers/pcmcia/pxa2xx_palmtx.c
index 1a2580450402..80645a688ee3 100644
--- a/drivers/pcmcia/pxa2xx_palmtx.c
+++ b/drivers/pcmcia/pxa2xx_palmtx.c
@@ -67,14 +67,6 @@ palmtx_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
         return 0;
 }
 
-static void palmtx_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
-{
-}
-
-static void palmtx_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
-{
-}
-
 static struct pcmcia_low_level palmtx_pcmcia_ops = {
         .owner                  = THIS_MODULE,
 
@@ -86,9 +78,6 @@ static struct pcmcia_low_level palmtx_pcmcia_ops = {
 
         .socket_state           = palmtx_pcmcia_socket_state,
         .configure_socket       = palmtx_pcmcia_configure_socket,
-
-        .socket_init            = palmtx_pcmcia_socket_init,
-        .socket_suspend         = palmtx_pcmcia_socket_suspend,
 };
 
 static struct platform_device *palmtx_pcmcia_device;
diff --git a/drivers/pcmcia/pxa2xx_stargate2.c b/drivers/pcmcia/pxa2xx_stargate2.c
index d08802fe35f9..939622251dfb 100644
--- a/drivers/pcmcia/pxa2xx_stargate2.c
+++ b/drivers/pcmcia/pxa2xx_stargate2.c
@@ -28,7 +28,6 @@
 
 #include "soc_common.h"
 
-#define SG2_S0_BUFF_CTL         120
 #define SG2_S0_POWER_CTL        108
 #define SG2_S0_GPIO_RESET       82
 #define SG2_S0_GPIO_DETECT      53
@@ -38,6 +37,11 @@ static struct pcmcia_irqs irqs[] = {
         { 0, IRQ_GPIO(SG2_S0_GPIO_DETECT), "PCMCIA0 CD" },
 };
 
+static struct gpio sg2_pcmcia_gpios[] = {
+        { SG2_S0_GPIO_RESET, GPIOF_OUT_INIT_HIGH, "PCMCIA Reset" },
+        { SG2_S0_POWER_CTL, GPIOF_OUT_INIT_HIGH, "PCMCIA Power Ctrl" },
+};
+
 static int sg2_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
         skt->socket.pci_irq = IRQ_GPIO(SG2_S0_GPIO_READY);
@@ -122,37 +126,23 @@ static int __init sg2_pcmcia_init(void)
         if (!sg2_pcmcia_device)
                 return -ENOMEM;
 
-        ret = gpio_request(SG2_S0_BUFF_CTL, "SG2 CF buff ctl");
+        ret = gpio_request_array(sg2_pcmcia_gpios, ARRAY_SIZE(sg2_pcmcia_gpios));
         if (ret)
                 goto error_put_platform_device;
-        ret = gpio_request(SG2_S0_POWER_CTL, "SG2 CF power ctl");
-        if (ret)
-                goto error_free_gpio_buff_ctl;
-        ret = gpio_request(SG2_S0_GPIO_RESET, "SG2 CF reset");
-        if (ret)
-                goto error_free_gpio_power_ctl;
-        /* Set gpio directions */
-        gpio_direction_output(SG2_S0_BUFF_CTL, 0);
-        gpio_direction_output(SG2_S0_POWER_CTL, 1);
-        gpio_direction_output(SG2_S0_GPIO_RESET, 1);
 
         ret = platform_device_add_data(sg2_pcmcia_device,
                                        &sg2_pcmcia_ops,
                                        sizeof(sg2_pcmcia_ops));
         if (ret)
-                goto error_free_gpio_reset;
+                goto error_free_gpios;
 
         ret = platform_device_add(sg2_pcmcia_device);
         if (ret)
-                goto error_free_gpio_reset;
+                goto error_free_gpios;
 
         return 0;
-error_free_gpio_reset:
-        gpio_free(SG2_S0_GPIO_RESET);
-error_free_gpio_power_ctl:
-        gpio_free(SG2_S0_POWER_CTL);
-error_free_gpio_buff_ctl:
-        gpio_free(SG2_S0_BUFF_CTL);
+error_free_gpios:
+        gpio_free_array(sg2_pcmcia_gpios, ARRAY_SIZE(sg2_pcmcia_gpios));
 error_put_platform_device:
         platform_device_put(sg2_pcmcia_device);
 
@@ -162,9 +152,7 @@ error_put_platform_device:
 static void __exit sg2_pcmcia_exit(void)
 {
         platform_device_unregister(sg2_pcmcia_device);
-        gpio_free(SG2_S0_BUFF_CTL);
-        gpio_free(SG2_S0_POWER_CTL);
-        gpio_free(SG2_S0_GPIO_RESET);
+        gpio_free_array(sg2_pcmcia_gpios, ARRAY_SIZE(sg2_pcmcia_gpios));
 }
 
 fs_initcall(sg2_pcmcia_init);
diff --git a/drivers/pcmcia/pxa2xx_viper.c b/drivers/pcmcia/pxa2xx_viper.c
index a51f2077644a..1064b1c2869d 100644
--- a/drivers/pcmcia/pxa2xx_viper.c
+++ b/drivers/pcmcia/pxa2xx_viper.c
@@ -136,22 +136,12 @@ static int viper_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
         return 0;
 }
 
-static void viper_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
-{
-}
-
-static void viper_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
-{
-}
-
 static struct pcmcia_low_level viper_pcmcia_ops = {
         .owner                  = THIS_MODULE,
         .hw_init                = viper_pcmcia_hw_init,
         .hw_shutdown            = viper_pcmcia_hw_shutdown,
         .socket_state           = viper_pcmcia_socket_state,
         .configure_socket       = viper_pcmcia_configure_socket,
-        .socket_init            = viper_pcmcia_socket_init,
-        .socket_suspend         = viper_pcmcia_socket_suspend,
         .nr                     = 1,
 };
 
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index 768f9572a8c8..a0a9c2aa8d78 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -186,8 +186,8 @@ static int soc_common_pcmcia_sock_init(struct pcmcia_socket *sock)
         struct soc_pcmcia_socket *skt = to_soc_pcmcia_socket(sock);
 
         debug(skt, 2, "initializing socket\n");
-
-        skt->ops->socket_init(skt);
+        if (skt->ops->socket_init)
+                skt->ops->socket_init(skt);
         return 0;
 }
 
@@ -207,7 +207,8 @@ static int soc_common_pcmcia_suspend(struct pcmcia_socket *sock)
 
         debug(skt, 2, "suspending socket\n");
 
-        skt->ops->socket_suspend(skt);
+        if (skt->ops->socket_suspend)
+                skt->ops->socket_suspend(skt);
 
         return 0;
 }