drivers/block/sx8.c: Use the DMA_{64,
Subsystems (2)
PATCH 2/3 drivers/block/sx8.c: 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()
These patches include 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/block/sx8.c +4 -3
@@ -26,6 +26,7 @@#include <linux/delay.h> #include <linux/time.h> #include <linux/hdreg.h> +#include <linux/dma-mapping.h> #include <asm/io.h> #include <asm/semaphore.h> #include <asm/uaccess.h>
@@ -1582,9 +1583,9 @@ static int carm_init_one (struct pci_dev goto err_out;#if IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */ - rc =pci_set_dma_mask (pdev,0xffffffffffffffffULL ); + rc =pci_set_dma_mask (pdev,DMA_64BIT_MASK );if (!rc) { - rc =pci_set_consistent_dma_mask (pdev,0xffffffffffffffffULL ); + rc =pci_set_consistent_dma_mask (pdev,DMA_64BIT_MASK );if (rc) { printk(KERN_ERR DRV_NAME "(%s): consistent DMA mask failure\n", pci_name(pdev));
@@ -1593,7 +1594,7 @@ static int carm_init_one (struct pci_dev pci_dac = 1; }else {#endif - rc =pci_set_dma_mask (pdev,0xffffffffULL ); + rc =pci_set_dma_mask (pdev,DMA_32BIT_MASK );if (rc) { printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n", pci_name(pdev));
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors