pcmcia: do not use io_req_t after call to pcmcia_request_io()

[net-next-2.6.git] / drivers / char / pcmcia / ipwireless / main.c

diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index 63c32e3f23ba811fac644b38506c1ebe83bbd71a..9467994d556f75d8f45ab142f474387f2869d850 100644 (file)
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -100,7 +100,8 @@ static int ipwireless_probe(struct pcmcia_device *p_dev,
        if (ret)
                return ret;
 
-       io_resource = request_region(p_dev->io.BasePort1, p_dev->io.NumPorts1,
+       io_resource = request_region(p_dev->resource[0]->start,
+                               resource_size(p_dev->resource[0]),
                                IPWIRELESS_PCCARD_NAME);
 
        if (cfg->mem.nwin == 0)
@@ -197,7 +198,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
        INIT_WORK(&ipw->work_reboot, signalled_reboot_work);
 
-       ipwireless_init_hardware_v1(ipw->hardware, link->io.BasePort1,
+       ipwireless_init_hardware_v1(ipw->hardware, link->resource[0]->start,
                                    ipw->attr_memory, ipw->common_memory,
                                    ipw->is_v2_card, signalled_reboot_callback,
                                    ipw);
@@ -209,10 +210,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
        printk(KERN_INFO IPWIRELESS_PCCARD_NAME ": Card type %s\n",
                        ipw->is_v2_card ? "V2/V3" : "V1");
        printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                       ": I/O ports 0x%04x-0x%04x, irq %d\n",
-                       (unsigned int) link->io.BasePort1,
-                       (unsigned int) (link->io.BasePort1 +
-                               link->io.NumPorts1 - 1),
+               ": I/O ports %pR, irq %d\n", link->resource[0],
                        (unsigned int) link->irq);
        if (ipw->attr_memory && ipw->common_memory)
                printk(KERN_INFO IPWIRELESS_PCCARD_NAME