diff options
| author | Kashyap, Desai <kashyap.desai@lsi.com> | 2009-12-16 18:51:45 +0530 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-02-08 18:19:38 -0600 |
| commit | 6846e75cdfa76c6609ac0381a6739c9f4af8fd3b (patch) | |
| tree | 7bec8c4e35f1bf73ebe34dc55fe89d6b9653f242 /drivers/scsi/mpt2sas/mpt2sas_base.h | |
| parent | b2ff36ba19dec02b05d3e26e36923b71ab64f34a (diff) | |
| download | lwn-6846e75cdfa76c6609ac0381a6739c9f4af8fd3b.tar.gz lwn-6846e75cdfa76c6609ac0381a6739c9f4af8fd3b.zip | |
[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.h | 4 |
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); * @pdev: pci pdev object * @chip: memory mapped register space * @chip_phys: physical addrss prior to mapping - * @pio_chip: I/O mapped register space * @logging_level: see mpt2sas_debug.h * @fwfault_debug: debuging FW timeouts * @ir_firmware: IR firmware present @@ -587,8 +586,7 @@ struct MPT2SAS_ADAPTER { char tmp_string[MPT_STRING_LENGTH]; struct pci_dev *pdev; Mpi2SystemInterfaceRegs_t __iomem *chip; - unsigned long chip_phys; - unsigned long pio_chip; + resource_size_t chip_phys; int logging_level; int fwfault_debug; u8 ir_firmware; |