scsi: ncr5380: Use correct types for device register accessors

[mirror_ubuntu-bionic-kernel.git] / drivers / scsi / dmx3191d.c

diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c
index 9b5a457d4bca4371a147af0cf786dc08a7c97f9d..ab7b097a465f0fa0c93b3c4e4044e3ec407fa01f 100644 (file)
--- a/drivers/scsi/dmx3191d.c
+++ b/drivers/scsi/dmx3191d.c
@@ -34,8 +34,8 @@
  * Definitions for the generic 5380 driver.
  */
 
-#define NCR5380_read(reg)              inb(instance->io_port + reg)
-#define NCR5380_write(reg, value)      outb(value, instance->io_port + reg)
+#define NCR5380_read(reg)              inb(hostdata->base + (reg))
+#define NCR5380_write(reg, value)      outb(value, hostdata->base + (reg))
 
 #define NCR5380_dma_xfer_len(instance, cmd, phase)     (0)
 #define NCR5380_dma_recv_setup(instance, dst, len)     (0)
@@ -71,6 +71,7 @@ static int dmx3191d_probe_one(struct pci_dev *pdev,
                              const struct pci_device_id *id)
 {
        struct Scsi_Host *shost;
+       struct NCR5380_hostdata *hostdata;
        unsigned long io;
        int error = -ENODEV;
 
@@ -88,7 +89,9 @@ static int dmx3191d_probe_one(struct pci_dev *pdev,
                        sizeof(struct NCR5380_hostdata));
        if (!shost)
                goto out_release_region;       
-       shost->io_port = io;
+
+       hostdata = shost_priv(shost);
+       hostdata->base = io;
 
        /* This card does not seem to raise an interrupt on pdev->irq.
         * Steam-powered SCSI controllers run without an IRQ anyway.
@@ -125,7 +128,8 @@ out_host_put:
 static void dmx3191d_remove_one(struct pci_dev *pdev)
 {
        struct Scsi_Host *shost = pci_get_drvdata(pdev);
-       unsigned long io = shost->io_port;
+       struct NCR5380_hostdata *hostdata = shost_priv(shost);
+       unsigned long io = hostdata->base;
 
        scsi_remove_host(shost);