3 files changed, 2 insertions, 15 deletions

diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index 7cee7f4eb60b..7892ac163522 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -20,7 +20,6 @@
 #include <linux/mmc/sdio_func.h>
 #include <linux/slab.h>
 
-#include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c
index e72f4046a5e0..526682d68de8 100644
--- a/drivers/ssb/pcmcia.c
+++ b/drivers/ssb/pcmcia.c
@@ -13,7 +13,6 @@
 #include <linux/io.h>
 #include <linux/etherdevice.h>
 
-#include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ciscode.h>
@@ -72,14 +71,9 @@
 /* Write to a PCMCIA configuration register. */
 static int ssb_pcmcia_cfg_write(struct ssb_bus *bus, u8 offset, u8 value)
 {
-        conf_reg_t reg;
         int res;
 
-        memset(&reg, 0, sizeof(reg));
-        reg.Offset = offset;
-        reg.Action = CS_WRITE;
-        reg.Value = value;
-        res = pcmcia_access_configuration_register(bus->host_pcmcia, &reg);
+        res = pcmcia_write_config_byte(bus->host_pcmcia, offset, value);
         if (unlikely(res != 0))
                 return -EBUSY;
 
@@ -89,16 +83,11 @@ static int ssb_pcmcia_cfg_write(struct ssb_bus *bus, u8 offset, u8 value)
 /* Read from a PCMCIA configuration register. */
 static int ssb_pcmcia_cfg_read(struct ssb_bus *bus, u8 offset, u8 *value)
 {
-        conf_reg_t reg;
         int res;
 
-        memset(&reg, 0, sizeof(reg));
-        reg.Offset = offset;
-        reg.Action = CS_READ;
-        res = pcmcia_access_configuration_register(bus->host_pcmcia, &reg);
+        res = pcmcia_read_config_byte(bus->host_pcmcia, offset, value);
         if (unlikely(res != 0))
                 return -EBUSY;
-        *value = reg.Value;
 
         return 0;
 }
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c
index 0d6c0280eb34..9738cad4ba13 100644
--- a/drivers/ssb/scan.c
+++ b/drivers/ssb/scan.c
@@ -17,7 +17,6 @@
 #include <linux/pci.h>
 #include <linux/io.h>
 
-#include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>