scsi: qla2xxx: use lower_32_bits and upper_32_bits instead of reinventing them

This also moves the optimization for builds with 32-bit dma_addr_t to
the compiler (where it belongs) instead of opencoding it based on
incorrect assumptions.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index c4504740f0e2123ba410eada3b84bb3c80ce8fca..bceb8e882e7f9f827a4bfae95a0892a97405683f 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -2660,9 +2660,9 @@ static void qlt_load_cont_data_segments(struct qla_tgt_prm *prm)
                    cnt < QLA_TGT_DATASEGS_PER_CONT_24XX && prm->seg_cnt;
                    cnt++, prm->seg_cnt--) {
                        *dword_ptr++ =
-                           cpu_to_le32(pci_dma_lo32
+                           cpu_to_le32(lower_32_bits
                                (sg_dma_address(prm->sg)));
-                       *dword_ptr++ = cpu_to_le32(pci_dma_hi32
+                       *dword_ptr++ = cpu_to_le32(upper_32_bits
                            (sg_dma_address(prm->sg)));
                        *dword_ptr++ = cpu_to_le32(sg_dma_len(prm->sg));
 
@@ -2704,9 +2704,9 @@ static void qlt_load_data_segments(struct qla_tgt_prm *prm)
            (cnt < QLA_TGT_DATASEGS_PER_CMD_24XX) && prm->seg_cnt;
            cnt++, prm->seg_cnt--) {
                *dword_ptr++ =
-                   cpu_to_le32(pci_dma_lo32(sg_dma_address(prm->sg)));
+                   cpu_to_le32(lower_32_bits(sg_dma_address(prm->sg)));
 
-               *dword_ptr++ = cpu_to_le32(pci_dma_hi32(
+               *dword_ptr++ = cpu_to_le32(upper_32_bits(
                        sg_dma_address(prm->sg)));
 
                *dword_ptr++ = cpu_to_le32(sg_dma_len(prm->sg));

diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h
index 721da593b1bcf0f2a4b4170dfc9b65a39528601f..577e1786a3f1b374b397e0983742463393507ec2 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_target.h
+++ b/drivers/scsi/qla2xxx/qla_target.h
@@ -771,14 +771,6 @@ int qla2x00_wait_for_hba_online(struct scsi_qla_host *);
 #define        FC_TM_REJECT                4
 #define FC_TM_FAILED                5
 
-#if (BITS_PER_LONG > 32) || defined(CONFIG_HIGHMEM64G)
-#define pci_dma_lo32(a) (a & 0xffffffff)
-#define pci_dma_hi32(a) ((((a) >> 16)>>16) & 0xffffffff)
-#else
-#define pci_dma_lo32(a) (a & 0xffffffff)
-#define pci_dma_hi32(a) 0
-#endif
-
 #define QLA_TGT_SENSE_VALID(sense)  ((sense != NULL) && \
                                (((const uint8_t *)(sense))[0] & 0x70) == 0x70)