lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/net/: Use the DMA_{64,32}BIT_MASK constants

Browse Source 
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:
Domen Puncer
2005-06-26 18:22:14 -04:00
committed by Jeff Garzik
parent 5ccabb9b45
commit 1e7f0bd8c8
11 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/acenic.c
View File

@@ -58,6 +58,7 @@
#include <linux/errno.h>
#include <linux/ioport.h>
#include <linux/pci.h>
#include <linux/dma-mapping.h>
#include <linux/kernel.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
@@ -1167,9 +1168,9 @@ static int __devinit ace_init(struct net_device *dev)
/*
* Configure DMA attributes.
*/
if (!pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) {
if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
ap->pci_using_dac = 1;
} else if (!pci_set_dma_mask(pdev, 0xffffffffULL)) {
} else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
ap->pci_using_dac = 0;
} else {
ecode = -ENODEV;