drivers/scsi/ips: Use the DMA_{64,
Subsystems (4)
PATCH 13/19 drivers/scsi/ips: Use the DMA_{64,
The previous patch did not compile cleanly on all architectures so here's a fixed one.
Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
This patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise.
See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details
Signed-off-by Tobias Klauser <[email protected]>
drivers/scsi/ips.c +3 -2
@@ -176,6 +176,7 @@#include <linux/blkdev.h> #include <linux/types.h> +#include <linux/dma-mapping.h> #include <scsi/sg.h>
@@ -7290,10 +7291,10 @@ ips_init_phase1(struct pci_dev *pci_dev,* are guaranteed to be < 4G. */ if (IPS_ENABLE_DMA64 &&IPS_HAS_ENH_SGLIST (ha) && - !pci_set_dma_mask (ha->pcidev,0xffffffffffffffffULL )) { + !pci_set_dma_mask (ha->pcidev,DMA_64BIT_MASK )) { (ha)->flags |=IPS_HA_ENH_SG ; }else { -if (pci_set_dma_mask (ha->pcidev,0xffffffffULL ) !=0 ) { +if (pci_set_dma_mask (ha->pcidev,DMA_32BIT_MASK ) !=0 ) {printk (KERN_WARNING "Unable to set DMA Mask\n" );return ips_abort_init (ha, index); }
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors