[SCSI] aacraid: Use resource_size_t for IO mem pointers and offsets

This also stops using the "legacy crap" in Scsi_Host (shost->base is an
unsigned long).

This affected 32-bit systems that have 64-bit resource sizes, causing the
IO address to be truncated.

Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Acked-by: Achim Leubner <Achim_Leubner@pmc-sierra.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c
index 762820636304..27a3e77de17f 100644
--- a/drivers/scsi/aacraid/src.c
+++ b/drivers/scsi/aacraid/src.c
@@ -435,8 +435,7 @@ static int aac_src_ioremap(struct aac_dev *dev, u32 size)
         dev->base = NULL;
         if (dev->regs.src.bar1 == NULL)
                 return -1;
-        dev->base = dev->regs.src.bar0 = ioremap(dev->scsi_host_ptr->base,
-                                size);
+        dev->base = dev->regs.src.bar0 = ioremap(dev->base_start, size);
         if (dev->base == NULL) {
                 iounmap(dev->regs.src.bar1);
                 dev->regs.src.bar1 = NULL;
@@ -459,7 +458,7 @@ static int aac_srcv_ioremap(struct aac_dev *dev, u32 size)
                 dev->base = dev->regs.src.bar0 = NULL;
                 return 0;
         }
-        dev->base = dev->regs.src.bar0 = ioremap(dev->scsi_host_ptr->base, size);
+        dev->base = dev->regs.src.bar0 = ioremap(dev->base_start, size);
         if (dev->base == NULL)
                 return -1;
         dev->IndexRegs = &((struct src_registers __iomem *)
@@ -764,7 +763,7 @@ int aac_srcv_init(struct aac_dev *dev)
                         name, instance);
                 goto error_iounmap;
         }
-        dev->dbg_base = dev->scsi_host_ptr->base;
+        dev->dbg_base = dev->base_start;
         dev->dbg_base_mapped = dev->base;
         dev->dbg_size = dev->base_size;