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, 34 insertions, 36 deletions

diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index 24d2007139e8..d52e90a5a617 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -865,9 +865,6 @@ static int bluecard_probe(struct pcmcia_device *link)
         info->p_dev = link;
         link->priv = info;
 
-        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-        link->io.NumPorts1 = 8;
-
         link->conf.Attributes = CONF_ENABLE_IRQ;
         link->conf.IntType = INT_MEMORY_AND_IO;
 
@@ -890,12 +887,14 @@ static int bluecard_config(struct pcmcia_device *link)
         int i, n;
 
         link->conf.ConfigIndex = 0x20;
-        link->io.NumPorts1 = 64;
-        link->io.IOAddrLines = 6;
+
+        link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
+        link->resource[0]->end = 64;
+        link->io_lines = 6;
 
         for (n = 0; n < 0x400; n += 0x40) {
-                link->io.BasePort1 = n ^ 0x300;
-                i = pcmcia_request_io(link, &link->io);
+                link->resource[0]->start = n ^ 0x300;
+                i = pcmcia_request_io(link);
                 if (i == 0)
                         break;
         }
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 8ab494c0c17f..7ab8f29d5e0d 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -657,8 +657,8 @@ static int bt3c_probe(struct pcmcia_device *link)
         info->p_dev = link;
         link->priv = info;
 
-        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-        link->io.NumPorts1 = 8;
+        link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
+        link->resource[0]->end = 8;
 
         link->conf.Attributes = CONF_ENABLE_IRQ;
         link->conf.IntType = INT_MEMORY_AND_IO;
@@ -683,14 +683,14 @@ static int bt3c_check_config(struct pcmcia_device *p_dev,
 {
         unsigned long try = (unsigned long) priv_data;
 
+        p_dev->io_lines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK;
+
         if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))
                 p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
         if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) &&
             (cf->io.win[0].base != 0)) {
-                p_dev->io.BasePort1 = cf->io.win[0].base;
-                p_dev->io.IOAddrLines = (try == 0) ? 16 :
-                        cf->io.flags & CISTPL_IO_LINES_MASK;
-                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                p_dev->resource[0]->start = cf->io.win[0].base;
+                if (!pcmcia_request_io(p_dev))
                         return 0;
         }
         return -ENODEV;
@@ -707,9 +707,9 @@ static int bt3c_check_config_notpicky(struct pcmcia_device *p_dev,
 
         if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
                 for (j = 0; j < 5; j++) {
-                        p_dev->io.BasePort1 = base[j];
-                        p_dev->io.IOAddrLines = base[j] ? 16 : 3;
-                        if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        p_dev->resource[0]->start = base[j];
+                        p_dev->io_lines = base[j] ? 16 : 3;
+                        if (!pcmcia_request_io(p_dev))
                                 return 0;
                 }
         }
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 7e770d40368d..1c4f5e863b03 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -586,8 +586,8 @@ static int btuart_probe(struct pcmcia_device *link)
         info->p_dev = link;
         link->priv = info;
 
-        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-        link->io.NumPorts1 = 8;
+        link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
+        link->resource[0]->end = 8;
 
         link->conf.Attributes = CONF_ENABLE_IRQ;
         link->conf.IntType = INT_MEMORY_AND_IO;
@@ -612,14 +612,14 @@ static int btuart_check_config(struct pcmcia_device *p_dev,
 {
         int *try = priv_data;
 
+        p_dev->io_lines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK;
+
         if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))
                 p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
         if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) &&
             (cf->io.win[0].base != 0)) {
-                p_dev->io.BasePort1 = cf->io.win[0].base;
-                p_dev->io.IOAddrLines = (*try == 0) ? 16 :
-                        cf->io.flags & CISTPL_IO_LINES_MASK;
-                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                p_dev->resource[0]->start = cf->io.win[0].base;
+                if (!pcmcia_request_io(p_dev))
                         return 0;
         }
         return -ENODEV;
@@ -636,9 +636,9 @@ static int btuart_check_config_notpicky(struct pcmcia_device *p_dev,
 
         if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
                 for (j = 0; j < 5; j++) {
-                        p_dev->io.BasePort1 = base[j];
-                        p_dev->io.IOAddrLines = base[j] ? 16 : 3;
-                        if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        p_dev->resource[0]->start = base[j];
+                        p_dev->io_lines = base[j] ? 16 : 3;
+                        if (!pcmcia_request_io(p_dev))
                                 return 0;
                 }
         }
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index bfe9313516fb..18ecc5734e9f 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -572,8 +572,8 @@ static int dtl1_probe(struct pcmcia_device *link)
         info->p_dev = link;
         link->priv = info;
 
-        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-        link->io.NumPorts1 = 8;
+        link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
+        link->resource[0]->end = 8;
 
         link->conf.Attributes = CONF_ENABLE_IRQ;
         link->conf.IntType = INT_MEMORY_AND_IO;
@@ -597,14 +597,13 @@ static int dtl1_confcheck(struct pcmcia_device *p_dev,
                           unsigned int vcc,
                           void *priv_data)
 {
-        if ((cf->io.nwin == 1) && (cf->io.win[0].len > 8)) {
-                p_dev->io.BasePort1 = cf->io.win[0].base;
-                p_dev->io.NumPorts1 = cf->io.win[0].len;        /*yo */
-                p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
-                if (!pcmcia_request_io(p_dev, &p_dev->io))
-                        return 0;
-        }
-        return -ENODEV;
+        if ((cf->io.nwin != 1) || (cf->io.win[0].len <= 8))
+                return -ENODEV;
+
+        p_dev->resource[0]->start = cf->io.win[0].base;
+        p_dev->resource[0]->end = cf->io.win[0].len;    /*yo */
+        p_dev->io_lines = cf->io.flags & CISTPL_IO_LINES_MASK;
+        return pcmcia_request_io(p_dev);
 }
 
 static int dtl1_config(struct pcmcia_device *link)
@@ -613,7 +612,7 @@ static int dtl1_config(struct pcmcia_device *link)
         int i;
 
         /* Look for a generic full-sized window */
-        link->io.NumPorts1 = 8;
+        link->resource[0]->end = 8;
         if (pcmcia_loop_config(link, dtl1_confcheck, NULL) < 0)
                 goto failed;