Commit 6f6eb3cc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

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



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b03f3c3e

drivers/scsi/ips.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

	}

drivers/scsi/ips.h

+0 −3
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE