aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aacraid/sa.c
diff options
context:
space:
mode:
authorBen Collins <bcollins@ubuntu.com>2012-06-11 14:05:02 -0400
committerJames Bottomley <JBottomley@Parallels.com>2012-07-20 03:58:43 -0400
commitff08784b41e1ab5da6776411b7a8381fe942f2cc (patch)
tree0f26c0cbd909089ccca01ba3516040eb771ad552 /drivers/scsi/aacraid/sa.c
parent7e8a74b177f17d100916b6ad415450f7c9508691 (diff)
[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>
Diffstat (limited to 'drivers/scsi/aacraid/sa.c')
-rw-r--r--drivers/scsi/aacraid/sa.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index beb533630d4b..2244f315f33b 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -305,7 +305,7 @@ static int aac_sa_ioremap(struct aac_dev * dev, u32 size)
305 iounmap(dev->regs.sa); 305 iounmap(dev->regs.sa);
306 return 0; 306 return 0;
307 } 307 }
308 dev->base = dev->regs.sa = ioremap(dev->scsi_host_ptr->base, size); 308 dev->base = dev->regs.sa = ioremap(dev->base_start, size);
309 return (dev->base == NULL) ? -1 : 0; 309 return (dev->base == NULL) ? -1 : 0;
310} 310}
311 311
@@ -393,7 +393,7 @@ int aac_sa_init(struct aac_dev *dev)
393 name, instance); 393 name, instance);
394 goto error_iounmap; 394 goto error_iounmap;
395 } 395 }
396 dev->dbg_base = dev->scsi_host_ptr->base; 396 dev->dbg_base = dev->base_start;
397 dev->dbg_base_mapped = dev->base; 397 dev->dbg_base_mapped = dev->base;
398 dev->dbg_size = dev->base_size; 398 dev->dbg_size = dev->base_size;
399 399