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

After pcmcia_request_io(), do not make use of the values stored in
io_req_t, but instead use those found in struct pcmcia_device->resource[].

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
Acked-by: Marcel Holtmann <marcel@holtmann.org> (for drivers/bluetooth/)
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index bd79e45ab85..d99c0cbad2d 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -733,9 +733,9 @@ SYM53C500_config(struct pcmcia_device *link)
             (info->manf_id == MANFID_PIONEER) ||
             (info->manf_id == 0x0098)) {
                 /* set ATAcmd */
-                outb(0xb4, link->io.BasePort1 + 0xd);
-                outb(0x24, link->io.BasePort1 + 0x9);
-                outb(0x04, link->io.BasePort1 + 0xd);
+                outb(0xb4, link->resource[0]->start + 0xd);
+                outb(0x24, link->resource[0]->start + 0x9);
+                outb(0x04, link->resource[0]->start + 0xd);
         }
 
         /*
@@ -748,7 +748,7 @@ SYM53C500_config(struct pcmcia_device *link)
         *       0x130, 0x230, 0x280, 0x290,
         *       0x320, 0x330, 0x340, 0x350
         */
-        port_base = link->io.BasePort1;
+        port_base = link->resource[0]->start;
         irq_level = link->irq;
 
         DEB(printk("SYM53C500: port_base=0x%x, irq=%d, fast_pio=%d\n",
@@ -821,15 +821,15 @@ static int sym53c500_resume(struct pcmcia_device *link)
         if ((info->manf_id == MANFID_MACNICA) ||
             (info->manf_id == MANFID_PIONEER) ||
             (info->manf_id == 0x0098)) {
-                outb(0x80, link->io.BasePort1 + 0xd);
-                outb(0x24, link->io.BasePort1 + 0x9);
-                outb(0x04, link->io.BasePort1 + 0xd);
+                outb(0x80, link->resource[0]->start + 0xd);
+                outb(0x24, link->resource[0]->start + 0x9);
+                outb(0x04, link->resource[0]->start + 0xd);
         }
         /*
          *  If things don't work after a "resume",
          *  this is a good place to start looking.
          */
-        SYM53C500_int_host_reset(link->io.BasePort1);
+        SYM53C500_int_host_reset(link->resource[0]->start);
 
         return 0;
 }