pcmcia: do not use io_req_t when calling pcmcia_request_io()

[deliverable/linux.git] / drivers / scsi / pcmcia / nsp_cs.c

diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index d929891809ab66b016cac264f99e5b3264124e7e..8bb598bb440d9a4ef2bcaa21456a4e1c76a64409 100644 (file)
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1558,9 +1558,8 @@ static int nsp_cs_probe(struct pcmcia_device *link)
        nsp_dbg(NSP_DEBUG_INIT, "info=0x%p", info);
 
        /* The io structure describes IO port mapping */
-       link->io.NumPorts1       = 0x10;
-       link->io.Attributes1     = IO_DATA_PATH_WIDTH_AUTO;
-       link->io.IOAddrLines     = 10;  /* not used */
+       link->resource[0]->end   = 0x10;
+       link->resource[0]->flags = IO_DATA_PATH_WIDTH_AUTO;
 
        /* General socket configuration */
        link->conf.Attributes    = CONF_ENABLE_IRQ;
@@ -1641,24 +1640,23 @@ static int nsp_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.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-                       p_dev->io.BasePort1 = io->win[0].base;
-                       p_dev->io.NumPorts1 = io->win[0].len;
+                       p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
+                       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)
                                goto next_entry;
                }