From: Tobias Klauser Date: Mon, 20 Jun 2005 21:28:41 +0000 (-0700) Subject: [PATCH] drivers/net/wireless/ipw2200: Use the DMA_32BIT_MASK constant X-Git-Tag: v2.6.14-rc1~1017^2~43^2~6 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e08b44eedacb7824c88678d9a9ea7db25b5401c;p=linux-2.6 [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 Cc: Jeff Garzik Signed-off-by: Andrew Morton --- diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index e256d3181c..343838a532 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;