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, 16 insertions, 14 deletions

diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index 6be0e5f108b5..2a4cb9c18f01 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -97,9 +97,8 @@ static int ide_probe(struct pcmcia_device *link)
     info->p_dev = link;
     link->priv = info;
 
-    link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-    link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
-    link->io.IOAddrLines = 3;
+    link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
+    link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
     link->conf.Attributes = CONF_ENABLE_IRQ;
     link->conf.IntType = INT_MEMORY_AND_IO;
 
@@ -228,22 +227,25 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev,
 
         if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
                 cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                pdev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
+
                 pdev->conf.ConfigIndex = cfg->index;
-                pdev->io.BasePort1 = io->win[0].base;
-                pdev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-                if (!(io->flags & CISTPL_IO_16BIT))
-                        pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                pdev->resource[0]->start = io->win[0].base;
+                if (!(io->flags & CISTPL_IO_16BIT)) {
+                        pdev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
+                        pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
+                }
                 if (io->nwin == 2) {
-                        pdev->io.NumPorts1 = 8;
-                        pdev->io.BasePort2 = io->win[1].base;
-                        pdev->io.NumPorts2 = (stk->is_kme) ? 2 : 1;
-                        if (pcmcia_request_io(pdev, &pdev->io) != 0)
+                        pdev->resource[0]->end = 8;
+                        pdev->resource[1]->start = io->win[1].base;
+                        pdev->resource[1]->end = (stk->is_kme) ? 2 : 1;
+                        if (pcmcia_request_io(pdev) != 0)
                                 return -ENODEV;
                         stk->ctl_base = pdev->resource[1]->start;
                 } else if ((io->nwin == 1) && (io->win[0].len >= 16)) {
-                        pdev->io.NumPorts1 = io->win[0].len;
-                        pdev->io.NumPorts2 = 0;
-                        if (pcmcia_request_io(pdev, &pdev->io) != 0)
+                        pdev->resource[0]->end = io->win[0].len;
+                        pdev->resource[1]->end = 0;
+                        if (pcmcia_request_io(pdev) != 0)
                                 return -ENODEV;
                         stk->ctl_base = pdev->resource[0]->start + 0x0e;
                 } else