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, 21 insertions, 19 deletions

diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index c9cd2377ef91..9c5fc9dfc55d 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -477,29 +477,31 @@ static hw_info_t *get_hwired(struct pcmcia_device *link)
 static int try_io_port(struct pcmcia_device *link)
 {
     int j, ret;
-    if (link->io.NumPorts1 == 32) {
-        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-        if (link->io.NumPorts2 > 0) {
+    link->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
+    link->resource[1]->flags &= ~IO_DATA_PATH_WIDTH;
+    if (link->resource[0]->end == 32) {
+        link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
+        if (link->resource[1]->end > 0) {
             /* for master/slave multifunction cards */
-            link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
+            link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
         }
     } else {
         /* This should be two 16-port windows */
-        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-        link->io.Attributes2 = IO_DATA_PATH_WIDTH_16;
+        link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
+        link->resource[1]->flags |= IO_DATA_PATH_WIDTH_16;
     }
-    if (link->io.BasePort1 == 0) {
-        link->io.IOAddrLines = 16;
+    if (link->resource[0]->start == 0) {
         for (j = 0; j < 0x400; j += 0x20) {
-            link->io.BasePort1 = j ^ 0x300;
-            link->io.BasePort2 = (j ^ 0x300) + 0x10;
-            ret = pcmcia_request_io(link, &link->io);
+            link->resource[0]->start = j ^ 0x300;
+            link->resource[1]->start = (j ^ 0x300) + 0x10;
+            link->io_lines = 16;
+            ret = pcmcia_request_io(link);
             if (ret == 0)
                     return ret;
         }
         return ret;
     } else {
-        return pcmcia_request_io(link, &link->io);
+        return pcmcia_request_io(link);
     }
 }
 
@@ -520,18 +522,18 @@ static int pcnet_confcheck(struct pcmcia_device *p_dev,
            network function with window 0, and serial with window 1 */
         if (io->nwin > 1) {
                 i = (io->win[1].len > io->win[0].len);
-                p_dev->io.BasePort2 = io->win[1-i].base;
-                p_dev->io.NumPorts2 = io->win[1-i].len;
+                p_dev->resource[1]->start = io->win[1-i].base;
+                p_dev->resource[1]->end = io->win[1-i].len;
         } else {
-                i = p_dev->io.NumPorts2 = 0;
+                i = p_dev->resource[1]->end = 0;
         }
 
         *has_shmem = ((cfg->mem.nwin == 1) &&
                       (cfg->mem.win[0].len >= 0x4000));
-        p_dev->io.BasePort1 = io->win[i].base;
-        p_dev->io.NumPorts1 = io->win[i].len;
-        p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-        if (p_dev->io.NumPorts1 + p_dev->io.NumPorts2 >= 32)
+        p_dev->resource[0]->start = io->win[i].base;
+        p_dev->resource[0]->end = io->win[i].len;
+        p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
+        if (p_dev->resource[0]->end + p_dev->resource[1]->end >= 32)
                 return try_io_port(p_dev);
 
         return 0;