Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

[cascardo/linux.git] / drivers / pcmcia / pxa2xx_stargate2.c

diff --git a/drivers/pcmcia/pxa2xx_stargate2.c b/drivers/pcmcia/pxa2xx_stargate2.c
index 6c2366b..1d73c44 100644 (file)
--- a/drivers/pcmcia/pxa2xx_stargate2.c
+++ b/drivers/pcmcia/pxa2xx_stargate2.c
@@ -33,10 +33,6 @@
 #define SG2_S0_GPIO_DETECT     53
 #define SG2_S0_GPIO_READY      81
 
-static struct pcmcia_irqs irqs[] = {
-       {.sock = 0, .str = "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" },
@@ -44,27 +40,20 @@ static struct gpio sg2_pcmcia_gpios[] = {
 
 static int sg2_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
-       skt->socket.pci_irq = gpio_to_irq(SG2_S0_GPIO_READY);
-       irqs[0].irq = gpio_to_irq(SG2_S0_GPIO_DETECT);
-
-       return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
-}
-
-static void sg2_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
-{
-       soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
+       skt->stat[SOC_STAT_CD].gpio = SG2_S0_GPIO_DETECT;
+       skt->stat[SOC_STAT_CD].name = "PCMCIA0 CD";
+       skt->stat[SOC_STAT_RDY].gpio = SG2_S0_GPIO_READY;
+       skt->stat[SOC_STAT_RDY].name = "PCMCIA0 RDY";
+       return 0;
 }
 
 static void sg2_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
                                    struct pcmcia_state *state)
 {
-       state->detect = !gpio_get_value(SG2_S0_GPIO_DETECT);
-       state->ready  = !!gpio_get_value(SG2_S0_GPIO_READY);
        state->bvd1   = 0; /* not available - battery detect on card */
        state->bvd2   = 0; /* not available */
        state->vs_3v  = 1; /* not available - voltage detect for card */
        state->vs_Xv  = 0; /* not available */
-       state->wrprot = 0; /* not available - write protect */
 }
 
 static int sg2_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
@@ -94,24 +83,11 @@ static int sg2_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
        return 0;
 }
 
-static void sg2_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
-{
-       soc_pcmcia_enable_irqs(skt, irqs, ARRAY_SIZE(irqs));
-}
-
-static void sg2_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
-{
-       soc_pcmcia_disable_irqs(skt, irqs, ARRAY_SIZE(irqs));
-}
-
 static struct pcmcia_low_level sg2_pcmcia_ops __initdata = {
        .owner                  = THIS_MODULE,
        .hw_init                = sg2_pcmcia_hw_init,
-       .hw_shutdown            = sg2_pcmcia_hw_shutdown,
        .socket_state           = sg2_pcmcia_socket_state,
        .configure_socket       = sg2_pcmcia_configure_socket,
-       .socket_init            = sg2_pcmcia_socket_init,
-       .socket_suspend         = sg2_pcmcia_socket_suspend,
        .nr                     = 1,
 };