3 files changed, 12 insertions, 15 deletions

diff --git a/drivers/pcmcia/sa1100_h3600.c b/drivers/pcmcia/sa1100_h3600.c
index 6de4e1b41d60..0cc3748f3758 100644
--- a/drivers/pcmcia/sa1100_h3600.c
+++ b/drivers/pcmcia/sa1100_h3600.c
@@ -37,9 +37,9 @@ static void h3600_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
         soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
   
         /* Disable CF bus: */
-        clr_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON);
-        clr_h3600_egpio(IPAQ_EGPIO_OPT_ON);
-        set_h3600_egpio(IPAQ_EGPIO_OPT_RESET);
+        assign_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON, 0);
+        assign_h3600_egpio(IPAQ_EGPIO_OPT_ON, 0);
+        assign_h3600_egpio(IPAQ_EGPIO_OPT_RESET, 1);
 }
 
 static void
@@ -79,10 +79,7 @@ h3600_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_
                 return -1;
         }
 
-        if (state->flags & SS_RESET)
-                set_h3600_egpio(IPAQ_EGPIO_CARD_RESET);
-        else
-                clr_h3600_egpio(IPAQ_EGPIO_CARD_RESET);
+        assign_h3600_egpio(IPAQ_EGPIO_CARD_RESET, !!(state->flags & SS_RESET));
 
         /* Silently ignore Vpp, output enable, speaker enable. */
 
@@ -92,9 +89,9 @@ h3600_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_
 static void h3600_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
 {
         /* Enable CF bus: */
-        set_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON);
-        set_h3600_egpio(IPAQ_EGPIO_OPT_ON);
-        clr_h3600_egpio(IPAQ_EGPIO_OPT_RESET);
+        assign_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON, 1);
+        assign_h3600_egpio(IPAQ_EGPIO_OPT_ON, 1);
+        assign_h3600_egpio(IPAQ_EGPIO_OPT_RESET, 0);
 
         msleep(10);
 
@@ -112,10 +109,10 @@ static void h3600_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
          * socket 0 then socket 1.
          */
         if (skt->nr == 1) {
-                clr_h3600_egpio(IPAQ_EGPIO_OPT_ON);
-                clr_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON);
+                assign_h3600_egpio(IPAQ_EGPIO_OPT_ON, 0);
+                assign_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON, 0);
                 /* hmm, does this suck power? */
-                set_h3600_egpio(IPAQ_EGPIO_OPT_RESET);
+                assign_h3600_egpio(IPAQ_EGPIO_OPT_RESET, 1);
         }
 }
 
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index 6924d0ea8d32..401052a21ce8 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -11,12 +11,12 @@
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
+#include <linux/io.h>
 
 #include <pcmcia/ss.h>
 
 #include <mach/hardware.h>
 #include <asm/hardware/sa1111.h>
-#include <asm/io.h>
 #include <asm/irq.h>
 
 #include "sa1111_generic.h"
diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c
index 810ac492a8c9..e15d59f2d8a9 100644
--- a/drivers/pcmcia/sa11xx_base.c
+++ b/drivers/pcmcia/sa11xx_base.c
@@ -36,9 +36,9 @@
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
-#include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>