diff options
| author | Tobias Klauser <tklauser@nuerscht.ch> | 2005-06-20 23:28:40 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 05:25:10 +0200 |
| commit | 05743d165be9f0293b4ff67f4e1cf3724eb13e1f (patch) | |
| tree | e1c925bb8c981f4051f78432ed4d330018fa760e /drivers/net/wireless/ipw2100.c | |
| parent | [PATCH] ipw2100: remove commented-out code (diff) | |
| download | linux-05743d165be9f0293b4ff67f4e1cf3724eb13e1f.tar.xz linux-05743d165be9f0293b4ff67f4e1cf3724eb13e1f.zip | |
[PATCH] drivers/net/wireless/ipw2100: 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>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Diffstat (limited to 'drivers/net/wireless/ipw2100.c')
| -rw-r--r-- | drivers/net/wireless/ipw2100.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index 69d7787b44b9..2f2ae1777805 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c @@ -146,6 +146,7 @@ that only one external action is invoked at a time. #include <linux/netdevice.h> #include <linux/ethtool.h> #include <linux/pci.h> +#include <linux/dma-mapping.h> #include <linux/proc_fs.h> #include <linux/skbuff.h> #include <asm/uaccess.h> @@ -6423,10 +6424,6 @@ static struct net_device *ipw2100_alloc_device( return dev; } - - -#define PCI_DMA_32BIT 0x00000000ffffffffULL - static int ipw2100_pci_init_one(struct pci_dev *pci_dev, const struct pci_device_id *ent) { @@ -6480,7 +6477,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev, pci_set_master(pci_dev); pci_set_drvdata(pci_dev, priv); - err = pci_set_dma_mask(pci_dev, PCI_DMA_32BIT); + err = pci_set_dma_mask(pci_dev, DMA_32BIT_MASK); if (err) { printk(KERN_WARNING DRV_NAME "Error calling pci_set_dma_mask.\n"); |