Merge tag 'iio-fixes-for-4.17a' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / pcmcia / sa1100_simpad.c

diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c
index 7ce65bb23a8ee67d082dbeef1679a84f022253a6..e235ee14eaa6e2565630305da21de55e9fca8e69 100644 (file)
--- a/drivers/pcmcia/sa1100_simpad.c
+++ b/drivers/pcmcia/sa1100_simpad.c
@@ -12,7 +12,6 @@
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/irq.h>
 #include <mach/simpad.h>
 #include "sa1100_generic.h"
  
@@ -21,12 +20,10 @@ static int simpad_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 
        simpad_clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1);
 
-       skt->stat[SOC_STAT_CD].gpio = GPIO_CF_CD;
-       skt->stat[SOC_STAT_CD].name = "CF_CD";
-       skt->stat[SOC_STAT_RDY].gpio = GPIO_CF_IRQ;
-       skt->stat[SOC_STAT_RDY].name = "CF_RDY";
+       skt->stat[SOC_STAT_CD].name = "cf-detect";
+       skt->stat[SOC_STAT_RDY].name = "cf-ready";
 
-       return 0;
+       return soc_pcmcia_request_gpiods(skt);
 }
 
 static void simpad_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
@@ -42,9 +39,6 @@ simpad_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
 {
        long cs3reg = simpad_get_cs3_ro();
 
-       /* the detect signal is inverted - fix that up here */
-       state->detect = !state->detect;
-
        state->bvd1 = 1; /* Might be cs3reg & PCMCIA_BVD1 */
        state->bvd2 = 1; /* Might be cs3reg & PCMCIA_BVD2 */