pcmcia: do not use io_req_t when calling pcmcia_request_io()

[deliverable/linux.git] / drivers / net / pcmcia / 3c574_cs.c

diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index b5ea9b8cfd76e547fc40244ddaf96cd6fa766777..c683f77c6f424ebbc873d76f0e07cb386484ea70 100644 (file)
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -278,8 +278,8 @@ static int tc574_probe(struct pcmcia_device *link)
        lp->p_dev = link;
 
        spin_lock_init(&lp->window_lock);
-       link->io.NumPorts1 = 32;
-       link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+       link->resource[0]->end = 32;
+       link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
        link->conf.Attributes = CONF_ENABLE_IRQ;
        link->conf.IntType = INT_MEMORY_AND_IO;
        link->conf.ConfigIndex = 1;
@@ -337,10 +337,11 @@ static int tc574_config(struct pcmcia_device *link)
 
        dev_dbg(&link->dev, "3c574_config()\n");
 
-       link->io.IOAddrLines = 16;
+       link->io_lines = 16;
+
        for (i = j = 0; j < 0x400; j += 0x20) {
-               link->io.BasePort1 = j ^ 0x300;
-               i = pcmcia_request_io(link, &link->io);
+               link->resource[0]->start = j ^ 0x300;
+               i = pcmcia_request_io(link);
                if (i == 0)
                        break;
        }