pcmcia: do not use io_req_t after call to pcmcia_request_io()
[linux-2.6.git] / drivers / isdn / hisax / sedlbauer_cs.c
index 5dbad96..cecb35a 100644 (file)
@@ -296,27 +296,25 @@ static int __devinit sedlbauer_config(struct pcmcia_device *link)
        printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10);
     if (link->conf.Attributes & CONF_ENABLE_IRQ)
        printk(", irq %d", link->irq);
-    if (link->io.NumPorts1)
-       printk(", io 0x%04x-0x%04x", link->io.BasePort1,
-              link->io.BasePort1+link->io.NumPorts1-1);
-    if (link->io.NumPorts2)
-       printk(" & 0x%04x-0x%04x", link->io.BasePort2,
-              link->io.BasePort2+link->io.NumPorts2-1);
+    if (link->resource[0])
+       printk(" & %pR", link->resource[0]);
+    if (link->resource[1])
+       printk(" & %pR", link->resource[1]);
     if (link->win)
        printk(", mem 0x%06lx-0x%06lx", req->Base,
               req->Base+req->Size-1);
     printk("\n");
 
     icard.para[0] = link->irq;
-    icard.para[1] = link->io.BasePort1;
+    icard.para[1] = link->resource[0]->start;
     icard.protocol = protocol;
     icard.typ = ISDN_CTYPE_SEDLBAUER_PCMCIA;
     
     ret = hisax_init_pcmcia(link, 
                            &(((local_info_t *)link->priv)->stop), &icard);
     if (ret < 0) {
-       printk(KERN_ERR "sedlbauer_cs: failed to initialize SEDLBAUER PCMCIA %d at i/o %#x\n",
-               ret, link->io.BasePort1);
+       printk(KERN_ERR "sedlbauer_cs: failed to initialize SEDLBAUER PCMCIA %d with %pR\n",
+               ret, link->resource[0]);
        sedlbauer_release(link);
        return -ENODEV;
     } else