diff options
author | Tobias Klauser <tklauser@nuerscht.ch> | 2005-04-04 12:10:18 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-26 18:14:31 -0400 |
commit | 12b279f9c0cb70695865dc336161512fa6e75d50 (patch) | |
tree | 674089c0d5822f45fae9168cf45a8f7b3382c413 | |
parent | e8c0eee96801f3c3f577b377b89ab01ab36ba7b6 (diff) |
[PATCH] net/sis900: Use the DMA_32BIT_MASK constant
Use the DMA_32BIT_MASK constant from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask() instead of custom
macros.
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>
-rw-r--r-- | drivers/net/sis900.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index 3107aed0fb51..127324f014de 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
@@ -66,6 +66,7 @@ | |||
66 | #include <linux/ethtool.h> | 66 | #include <linux/ethtool.h> |
67 | #include <linux/crc32.h> | 67 | #include <linux/crc32.h> |
68 | #include <linux/bitops.h> | 68 | #include <linux/bitops.h> |
69 | #include <linux/dma-mapping.h> | ||
69 | 70 | ||
70 | #include <asm/processor.h> /* Processor type for cache alignment. */ | 71 | #include <asm/processor.h> /* Processor type for cache alignment. */ |
71 | #include <asm/io.h> | 72 | #include <asm/io.h> |
@@ -93,8 +94,6 @@ static int sis900_debug = -1; /* Use SIS900_DEF_MSG as value */ | |||
93 | 94 | ||
94 | /* Time in jiffies before concluding the transmitter is hung. */ | 95 | /* Time in jiffies before concluding the transmitter is hung. */ |
95 | #define TX_TIMEOUT (4*HZ) | 96 | #define TX_TIMEOUT (4*HZ) |
96 | /* SiS 900 is capable of 32 bits BM DMA */ | ||
97 | #define SIS900_DMA_MASK 0xffffffff | ||
98 | 97 | ||
99 | enum { | 98 | enum { |
100 | SIS_900 = 0, | 99 | SIS_900 = 0, |
@@ -414,7 +413,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev, | |||
414 | ret = pci_enable_device(pci_dev); | 413 | ret = pci_enable_device(pci_dev); |
415 | if(ret) return ret; | 414 | if(ret) return ret; |
416 | 415 | ||
417 | i = pci_set_dma_mask(pci_dev, SIS900_DMA_MASK); | 416 | i = pci_set_dma_mask(pci_dev, DMA_32BIT_MASK); |
418 | if(i){ | 417 | if(i){ |
419 | printk(KERN_ERR "sis900.c: architecture does not support" | 418 | printk(KERN_ERR "sis900.c: architecture does not support" |
420 | "32bit PCI busmaster DMA\n"); | 419 | "32bit PCI busmaster DMA\n"); |