summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@nuerscht.ch>2005-06-20 14:28:41 -0700
committerJeff Garzik <jgarzik@pobox.com>2005-06-27 23:25:10 -0400
commit0e08b44eedacb7824c88678d9a9ea7db25b5401c (patch)
tree84ee98bf0e580b5e552933053df9410fb1b6de76
parent05743d165be9f0293b4ff67f4e1cf3724eb13e1f (diff)
downloadlinux-3.10-0e08b44eedacb7824c88678d9a9ea7db25b5401c.tar.gz
linux-3.10-0e08b44eedacb7824c88678d9a9ea7db25b5401c.tar.bz2
linux-3.10-0e08b44eedacb7824c88678d9a9ea7db25b5401c.zip
[PATCH] drivers/net/wireless/ipw2200: 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>
-rw-r--r--drivers/net/wireless/ipw2200.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index e256d3181cf..343838a5327 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -6979,10 +6979,9 @@ static int ipw_pci_probe(struct pci_dev *pdev,
pci_set_master(pdev);
-#define PCI_DMA_32BIT 0x00000000ffffffffULL
- err = pci_set_dma_mask(pdev, PCI_DMA_32BIT);
+ err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (!err)
- err = pci_set_consistent_dma_mask(pdev, PCI_DMA_32BIT);
+ err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
if (err) {
printk(KERN_WARNING DRV_NAME ": No suitable DMA available.\n");
goto out_pci_disable_device;