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>

4 files changed, 26 insertions, 42 deletions

diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 18484edc1259..ec73d9f6d9ed 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1751,17 +1751,12 @@ static int cm4000_config_check(struct pcmcia_device *p_dev,
         if (!cfg->io.nwin)
                 return -ENODEV;
 
-        /* Get the IOaddr */
-        p_dev->io.BasePort1 = cfg->io.win[0].base;
-        p_dev->io.NumPorts1 = cfg->io.win[0].len;
-        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-        if (!(cfg->io.flags & CISTPL_IO_8BIT))
-                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-        if (!(cfg->io.flags & CISTPL_IO_16BIT))
-                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-        p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK;
-
-        return pcmcia_request_io(p_dev, &p_dev->io);
+        p_dev->resource[0]->start = cfg->io.win[0].base;
+        p_dev->resource[0]->end = cfg->io.win[0].len;
+        p_dev->resource[0]->flags |= pcmcia_io_cfg_data_width(cfg->io.flags);
+        p_dev->io_lines = cfg->io.flags & CISTPL_IO_LINES_MASK;
+
+        return pcmcia_request_io(p_dev);
 }
 
 static int cm4000_config(struct pcmcia_device * link, int devno)
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index a6bbf199dde9..815cde1d0570 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -527,16 +527,12 @@ static int cm4040_config_check(struct pcmcia_device *p_dev,
                 return -ENODEV;
 
         /* Get the IOaddr */
-        p_dev->io.BasePort1 = cfg->io.win[0].base;
-        p_dev->io.NumPorts1 = cfg->io.win[0].len;
-        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-        if (!(cfg->io.flags & CISTPL_IO_8BIT))
-                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-        if (!(cfg->io.flags & CISTPL_IO_16BIT))
-                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-        p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK;
-
-        rc = pcmcia_request_io(p_dev, &p_dev->io);
+        p_dev->resource[0]->start = cfg->io.win[0].base;
+        p_dev->resource[0]->end = cfg->io.win[0].len;
+        p_dev->resource[0]->flags |= pcmcia_io_cfg_data_width(cfg->io.flags);
+        p_dev->io_lines = cfg->io.flags & CISTPL_IO_LINES_MASK;
+        rc = pcmcia_request_io(p_dev);
+
         dev_printk(KERN_INFO, &p_dev->dev,
                    "pcmcia_request_io returned 0x%x\n", rc);
         return rc;
@@ -548,10 +544,6 @@ static int reader_config(struct pcmcia_device *link, int devno)
         struct reader_dev *dev;
         int fail_rc;
 
-        link->io.BasePort2 = 0;
-        link->io.NumPorts2 = 0;
-        link->io.Attributes2 = 0;
-
         if (pcmcia_loop_config(link, cm4040_config_check, NULL))
                 goto cs_release;
 
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index 9467994d556f..5f87b9f7b6d2 100644
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -88,15 +88,15 @@ static int ipwireless_probe(struct pcmcia_device *p_dev,
         memreq_t memreq_common_memory;
         int ret;
 
-        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->io.IOAddrLines = 16;
+        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;
 
         /* 0x40 causes it to generate level mode interrupts. */
         /* 0x04 enables IREQ pin. */
         p_dev->conf.ConfigIndex = cfg->index | 0x44;
-        ret = pcmcia_request_io(p_dev, &p_dev->io);
+        p_dev->io_lines = 16;
+        ret = pcmcia_request_io(p_dev);
         if (ret)
                 return ret;
 
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 8ded9b02b9b9..9ecd6bef5d3b 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -571,18 +571,15 @@ static int mgslpc_ioprobe(struct pcmcia_device *p_dev,
                           unsigned int vcc,
                           void *priv_data)
 {
-        if (cfg->io.nwin > 0) {
-                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                if (!(cfg->io.flags & CISTPL_IO_8BIT))
-                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-                if (!(cfg->io.flags & CISTPL_IO_16BIT))
-                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK;
-                p_dev->io.BasePort1 = cfg->io.win[0].base;
-                p_dev->io.NumPorts1 = cfg->io.win[0].len;
-                return pcmcia_request_io(p_dev, &p_dev->io);
-        }
-        return -ENODEV;
+        if (!cfg->io.nwin)
+                return -ENODEV;
+
+        p_dev->resource[0]->start = cfg->io.win[0].base;
+        p_dev->resource[0]->end = cfg->io.win[0].len;
+        p_dev->resource[0]->flags |= pcmcia_io_cfg_data_width(cfg->io.flags);
+        p_dev->io_lines = cfg->io.flags & CISTPL_IO_LINES_MASK;
+
+        return pcmcia_request_io(p_dev);
 }
 
 static int mgslpc_config(struct pcmcia_device *link)