aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/mpt2sas/mpt2sas_base.h
diff options
context:
space:
mode:
authorKashyap, Desai <kashyap.desai@lsi.com>2009-12-16 08:21:45 -0500
committerJames Bottomley <James.Bottomley@suse.de>2010-02-08 19:19:38 -0500
commit6846e75cdfa76c6609ac0381a6739c9f4af8fd3b (patch)
tree7bec8c4e35f1bf73ebe34dc55fe89d6b9653f242 /drivers/scsi/mpt2sas/mpt2sas_base.h
parentb2ff36ba19dec02b05d3e26e36923b71ab64f34a (diff)
[SCSI] mpt2sas: User resource_size_t instead of unsigned long
Use resource_size_t to define the type resource for the system interface register set. The existing implementation was using "unsigned long" which would be 32 bit in 32 bit OS. If 32 bit OS is using 64 bit physical address space for the system interface register set, we need to shift to using resource_size_t which takes care of physical address space. Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com> Reviewed-by: Eric Moore <eric.moore@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_base.h')
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_base.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h
index bb4f14656afa..12fa18be77e1 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.h
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
@@ -464,7 +464,6 @@ typedef void (*MPT_ADD_SGE)(void *paddr, u32 flags_length, dma_addr_t dma_addr);
464 * @pdev: pci pdev object 464 * @pdev: pci pdev object
465 * @chip: memory mapped register space 465 * @chip: memory mapped register space
466 * @chip_phys: physical addrss prior to mapping 466 * @chip_phys: physical addrss prior to mapping
467 * @pio_chip: I/O mapped register space
468 * @logging_level: see mpt2sas_debug.h 467 * @logging_level: see mpt2sas_debug.h
469 * @fwfault_debug: debuging FW timeouts 468 * @fwfault_debug: debuging FW timeouts
470 * @ir_firmware: IR firmware present 469 * @ir_firmware: IR firmware present
@@ -587,8 +586,7 @@ struct MPT2SAS_ADAPTER {
587 char tmp_string[MPT_STRING_LENGTH]; 586 char tmp_string[MPT_STRING_LENGTH];
588 struct pci_dev *pdev; 587 struct pci_dev *pdev;
589 Mpi2SystemInterfaceRegs_t __iomem *chip; 588 Mpi2SystemInterfaceRegs_t __iomem *chip;
590 unsigned long chip_phys; 589 resource_size_t chip_phys;
591 unsigned long pio_chip;
592 int logging_level; 590 int logging_level;
593 int fwfault_debug; 591 int fwfault_debug;
594 u8 ir_firmware; 592 u8 ir_firmware;