提交 0e08b44e 编写于 作者: T Tobias Klauser 提交者: Jeff Garzik

[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: NTobias Klauser <tklauser@nuerscht.ch>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
上级 05743d16
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册