pcmcia: do not use io_req_t when calling pcmcia_request_io()

Instead of io_req_t, drivers are now requested to fill out
struct pcmcia_device *p_dev->resource[0,1] for up to two ioport
ranges. After a call to pcmcia_request_io(), the ports found there
are reserved, after calling pcmcia_request_configuration(), they may
be used.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
CC: Michael Buesch <mb@bu3sch.de>
Acked-by: Marcel Holtmann <marcel@holtmann.org> (for drivers/bluetooth/)
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

1 files changed, 10 insertions, 12 deletions

diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index b7e7f5054e44..d241b4aed71e 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -175,25 +175,23 @@ static int airo_cs_config_check(struct pcmcia_device *p_dev,
         p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
 
         /* IO window settings */
-        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
         if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
                 cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
-                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                if (!(io->flags & CISTPL_IO_8BIT))
-                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-                if (!(io->flags & CISTPL_IO_16BIT))
-                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                p_dev->io.BasePort1 = io->win[0].base;
-                p_dev->io.NumPorts1 = io->win[0].len;
+                p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
+                p_dev->resource[0]->flags |=
+                                        pcmcia_io_cfg_data_width(io->flags);
+                p_dev->resource[0]->start = io->win[0].base;
+                p_dev->resource[0]->end = io->win[0].len;
                 if (io->nwin > 1) {
-                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
-                        p_dev->io.BasePort2 = io->win[1].base;
-                        p_dev->io.NumPorts2 = io->win[1].len;
+                        p_dev->resource[1]->flags = p_dev->resource[0]->flags;
+                        p_dev->resource[1]->start = io->win[1].base;
+                        p_dev->resource[1]->end = io->win[1].len;
                 }
         }
 
         /* This reserves IO space but doesn't actually enable it */
-        if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
+        if (pcmcia_request_io(p_dev) != 0)
                 return -ENODEV;
 
         /*