net/ioc3-eth: Use the DMA_{32,64}BIT_MASK constants
Subsystems (3)
PATCH 1/1 net/ioc3-eth: Use the DMA_{32,64}BIT_MASK constants
Use the DMA_{32,64}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 patches caused errors on some architectures otherwise.
See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details
drivers/net/ioc3-eth.c +4 -3
@@ -38,6 +38,7 @@#include <linux/errno.h> #include <linux/module.h> #include <linux/pci.h> +#include <linux/dma-mapping.h> #include <linux/crc32.h> #include <linux/mii.h> #include <linux/in.h>
@@ -1193,17 +1194,17 @@ static int ioc3_probe(struct pci_dev *pdint err, pci_using_dac;/* 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 "%s: Unable to obtain 64 bit DMA " "for consistent allocations\n" ,pci_name (pdev)); goto out; } }else { - err =pci_set_dma_mask (pdev,0xffffffffULL ); + err =pci_set_dma_mask (pdev,DMA_32BIT_MASK );if (err) {printk (KERN_ERR "%s: No usable DMA configuration, " "aborting.\n" ,pci_name (pdev));
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors
[KJ] Re: [PATCH] net/ioc3-eth: Use the DMA_{32,
Quoted 7 lines · Tobias Klauser
Use the DMA_{32,64}BIT_MASK constants from
dma-mapping.hwhen callingpci_set_dma_mask()orpci_set_consistent_dma_mask()
This patch includesdma-mapping.hexplicitly because patches caused errors on some architectures otherwise.
See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for detailsSigned-off-by Tobias Klauser <[email protected]>
Looks good,
Ralf
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors