diff options
author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2009-04-06 22:01:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:11 -0400 |
commit | 284901a90a9e0b812ca3f5f852cbbfb60d10249d (patch) | |
tree | 06c1b5a0f83c90cfb662f756e7781977ce739ce8 /drivers/net/wireless/ipw2x00 | |
parent | 6afd142fd0dfba497246d0fab236c20a7b4bf778 (diff) |
dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/wireless/ipw2x00')
-rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2200.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index f4e963ba768b..97e5647ff050 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c | |||
@@ -6207,7 +6207,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev, | |||
6207 | pci_set_master(pci_dev); | 6207 | pci_set_master(pci_dev); |
6208 | pci_set_drvdata(pci_dev, priv); | 6208 | pci_set_drvdata(pci_dev, priv); |
6209 | 6209 | ||
6210 | err = pci_set_dma_mask(pci_dev, DMA_32BIT_MASK); | 6210 | err = pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32)); |
6211 | if (err) { | 6211 | if (err) { |
6212 | printk(KERN_WARNING DRV_NAME | 6212 | printk(KERN_WARNING DRV_NAME |
6213 | "Error calling pci_set_dma_mask.\n"); | 6213 | "Error calling pci_set_dma_mask.\n"); |
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index e17a4593e1f5..bd4dbcfe1bbe 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c | |||
@@ -11631,9 +11631,9 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev, | |||
11631 | 11631 | ||
11632 | pci_set_master(pdev); | 11632 | pci_set_master(pdev); |
11633 | 11633 | ||
11634 | err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); | 11634 | err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); |
11635 | if (!err) | 11635 | if (!err) |
11636 | err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); | 11636 | err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); |
11637 | if (err) { | 11637 | if (err) { |
11638 | printk(KERN_WARNING DRV_NAME ": No suitable DMA available.\n"); | 11638 | printk(KERN_WARNING DRV_NAME ": No suitable DMA available.\n"); |
11639 | goto out_pci_disable_device; | 11639 | goto out_pci_disable_device; |