Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / drivers / ssb / pcmcia.c

diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c
index e72f404..526682d 100644 (file)
--- 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;
 }