drivers/net/: Use the DMA_{64,32}BIT_MASK constants
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 <tklauser@nuerscht.ch> Signed-off-by: Domen Puncer <domen@coderock.org>
This commit is contained in:

committed by
Jeff Garzik

parent
5ccabb9b45
commit
1e7f0bd8c8
@@ -26,6 +26,7 @@
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/hdlc.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/delay.h>
|
||||
|
||||
@@ -624,8 +625,8 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
|
||||
/* FIXME when PCI/DMA subsystems are fixed.
|
||||
We set both dma_mask and consistent_dma_mask back to 32 bits
|
||||
to indicate the card can do 32-bit DMA addressing */
|
||||
if (pci_set_consistent_dma_mask(pdev, 0xFFFFFFFF) ||
|
||||
pci_set_dma_mask(pdev, 0xFFFFFFFF)) {
|
||||
if (pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK) ||
|
||||
pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
|
||||
printk(KERN_ERR "wanXL: No usable DMA configuration\n");
|
||||
wanxl_pci_remove_one(pdev);
|
||||
return -EIO;
|
||||
|
Reference in New Issue
Block a user