diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-10-18 15:03:33 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2018-11-06 21:31:28 -0500 |
| commit | 6f6eb3ccc6ff46137b1d2951ef3a0a163a0aa601 (patch) | |
| tree | 5022a3b6bd0bfb0a3b0fe4ddefe11d4d136fb9fc | |
| parent | b03f3c3e527a7da50f12ddb2021cb28ed99e46f7 (diff) | |
| download | linux-6f6eb3ccc6ff46137b1d2951ef3a0a163a0aa601.tar.gz linux-6f6eb3ccc6ff46137b1d2951ef3a0a163a0aa601.tar.bz2 linux-6f6eb3ccc6ff46137b1d2951ef3a0a163a0aa601.zip | |
scsi: ips: use lower_32_bits and upper_32_bits instead of reinventing them
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
| -rw-r--r-- | drivers/scsi/ips.c | 6 | ||||
| -rw-r--r-- | drivers/scsi/ips.h | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index ee8a1ecd58fd..679321e96a86 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c @@ -1801,13 +1801,13 @@ ips_fill_scb_sg_single(ips_ha_t * ha, dma_addr_t busaddr, } if (IPS_USE_ENH_SGLIST(ha)) { scb->sg_list.enh_list[indx].address_lo = - cpu_to_le32(pci_dma_lo32(busaddr)); + cpu_to_le32(lower_32_bits(busaddr)); scb->sg_list.enh_list[indx].address_hi = - cpu_to_le32(pci_dma_hi32(busaddr)); + cpu_to_le32(upper_32_bits(busaddr)); scb->sg_list.enh_list[indx].length = cpu_to_le32(e_len); } else { scb->sg_list.std_list[indx].address = - cpu_to_le32(pci_dma_lo32(busaddr)); + cpu_to_le32(lower_32_bits(busaddr)); scb->sg_list.std_list[indx].length = cpu_to_le32(e_len); } diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h index db546171e97f..42c180e3938b 100644 --- a/drivers/scsi/ips.h +++ b/drivers/scsi/ips.h @@ -96,9 +96,6 @@ #define __iomem #endif - #define pci_dma_hi32(a) ((a >> 16) >> 16) - #define pci_dma_lo32(a) (a & 0xffffffff) - #if (BITS_PER_LONG > 32) || defined(CONFIG_HIGHMEM64G) #define IPS_ENABLE_DMA64 (1) #else |