PCMCIA: pxa: convert PXA socket drivers to use new irq/gpio management

Convert all the PXA platform socket drivers to use the new irq/gpio
management provided by soc_common.  This relieves these drivers from
having to do anything with these GPIOs other than provide the numbers
to soc_common.

Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 5 insertions, 16 deletions

diff --git a/drivers/pcmcia/pxa2xx_balloon3.c b/drivers/pcmcia/pxa2xx_balloon3.c
index 22a75e610f12..12e38b497719 100644
--- a/drivers/pcmcia/pxa2xx_balloon3.c
+++ b/drivers/pcmcia/pxa2xx_balloon3.c
@@ -29,15 +29,6 @@
 
 #include "soc_common.h"
 
-/*
- * These are a list of interrupt sources that provokes a polled
- * check of status
- */
-static struct pcmcia_irqs irqs[] = {
-        { 0, BALLOON3_S0_CD_IRQ, "PCMCIA0 CD" },
-        { 0, BALLOON3_BP_NSTSCHG_IRQ, "PCMCIA0 STSCHG" },
-};
-
 static int balloon3_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
         uint16_t ver;
@@ -49,12 +40,12 @@ static int balloon3_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
                         ver);
 
         skt->socket.pci_irq = BALLOON3_BP_CF_NRDY_IRQ;
-        return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
-}
+        skt->stat[SOC_STAT_CD].gpio = BALLOON3_GPIO_S0_CD;
+        skt->stat[SOC_STAT_CD].name = "PCMCIA0 CD";
+        skt->stat[SOC_STAT_BVD1].irq = BALLOON3_BP_NSTSCHG_IRQ;
+        skt->stat[SOC_STAT_BVD1].name = "PCMCIA0 STSCHG";
 
-static void balloon3_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
-{
-        soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
+        return 0;
 }
 
 static unsigned long balloon3_pcmcia_status[2] = {
@@ -85,7 +76,6 @@ static void balloon3_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
                         disable_irq(BALLOON3_BP_NSTSCHG_IRQ);
         }
 
-        state->detect   = !gpio_get_value(BALLOON3_GPIO_S0_CD);
         state->ready    = !!(status & BALLOON3_CF_nIRQ);
         state->bvd1     = !!(status & BALLOON3_CF_nSTSCHG_BVD1);
         state->bvd2     = 0;    /* not available */
@@ -106,7 +96,6 @@ static int balloon3_pcmcia_configure_socket(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,
         .first                  = 0,