Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[karo-tx-linux.git] / drivers / net / wireless / libertas / if_cs.c

diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index a6fd70404c3d31793a2f6b27f05dd4151de04f25..e213a5dc049dc634b0daf4198f03ca027fd42be4 100644 (file)
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -28,7 +28,6 @@
 #include <linux/firmware.h>
 #include <linux/netdevice.h>
 
-#include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
@@ -800,9 +799,9 @@ static int if_cs_ioprobe(struct pcmcia_device *p_dev,
                         unsigned int vcc,
                         void *priv_data)
 {
-       p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-       p_dev->io.BasePort1 = cfg->io.win[0].base;
-       p_dev->io.NumPorts1 = cfg->io.win[0].len;
+       p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
+       p_dev->resource[0]->start = cfg->io.win[0].base;
+       p_dev->resource[0]->end = cfg->io.win[0].len;
 
        /* Do we need to allocate an interrupt? */
        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
@@ -814,7 +813,7 @@ static int if_cs_ioprobe(struct pcmcia_device *p_dev,
        }
 
        /* This reserves IO space but doesn't actually enable it */
-       return pcmcia_request_io(p_dev, &p_dev->io);
+       return pcmcia_request_io(p_dev);
 }
 
 static int if_cs_probe(struct pcmcia_device *p_dev)
@@ -853,7 +852,8 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
                goto out1;
 
        /* Initialize io access */
-       card->iobase = ioport_map(p_dev->io.BasePort1, p_dev->io.NumPorts1);
+       card->iobase = ioport_map(p_dev->resource[0]->start,
+                               resource_size(p_dev->resource[0]));
        if (!card->iobase) {
                lbs_pr_err("error in ioport_map\n");
                ret = -EIO;
@@ -872,9 +872,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
        }
 
        /* Finally, report what we've done */
-       lbs_deb_cs("irq %d, io 0x%04x-0x%04x\n",
-              p_dev->irq, p_dev->io.BasePort1,
-              p_dev->io.BasePort1 + p_dev->io.NumPorts1 - 1);
+       lbs_deb_cs("irq %d, io %pR", p_dev->irq, p_dev->resource[0]);
 
        /*
         * Most of the libertas cards can do unaligned register access, but some