drivers/net/tg3: Use the DMA_{64,
Subsystems (2)
PATCH 9/16 drivers/net/tg3: 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/net/tg3.c +4 -3
@@ -21,6 +21,7 @@#include <linux/init.h> #include <linux/ioport.h> #include <linux/pci.h> +#include <linux/dma-mapping.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/skbuff.h>
@@ -8663,17 +8664,17 @@ static int __devinit tg3_init_one(struct }/* Configure DMA attributes. */ - err =pci_set_dma_mask (pdev,0xffffffffffffffffULL ); + err =pci_set_dma_mask (pdev,DMA_64BIT_MASK );if (!err) { pci_using_dac =1 ; - err =pci_set_consistent_dma_mask (pdev,0xffffffffffffffffULL ); + err =pci_set_consistent_dma_mask (pdev,DMA_64BIT_MASK );if (err <0 ) { printk(KERN_ERR PFX "Unable to obtain 64 bit DMA " "for consistent allocations\n"); goto err_out_free_res; } }else { - err =pci_set_dma_mask (pdev,0xffffffffULL ); + err =pci_set_dma_mask (pdev,DMA_32BIT_MASK );if (err) { printk(KERN_ERR PFX "No usable DMA configuration, " "aborting.\n");
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors