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/tulip | |
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/tulip')
-rw-r--r-- | drivers/net/tulip/dmfe.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/uli526x.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/winbond-840.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c index e2c9d0f5a755..f2e669974c78 100644 --- a/drivers/net/tulip/dmfe.c +++ b/drivers/net/tulip/dmfe.c | |||
@@ -383,7 +383,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev, | |||
383 | return -ENOMEM; | 383 | return -ENOMEM; |
384 | SET_NETDEV_DEV(dev, &pdev->dev); | 384 | SET_NETDEV_DEV(dev, &pdev->dev); |
385 | 385 | ||
386 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { | 386 | if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) { |
387 | printk(KERN_WARNING DRV_NAME | 387 | printk(KERN_WARNING DRV_NAME |
388 | ": 32-bit PCI DMA not available.\n"); | 388 | ": 32-bit PCI DMA not available.\n"); |
389 | err = -ENODEV; | 389 | err = -ENODEV; |
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c index c227db079621..8761a5a5bd79 100644 --- a/drivers/net/tulip/uli526x.c +++ b/drivers/net/tulip/uli526x.c | |||
@@ -282,7 +282,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev, | |||
282 | return -ENOMEM; | 282 | return -ENOMEM; |
283 | SET_NETDEV_DEV(dev, &pdev->dev); | 283 | SET_NETDEV_DEV(dev, &pdev->dev); |
284 | 284 | ||
285 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { | 285 | if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) { |
286 | printk(KERN_WARNING DRV_NAME ": 32-bit PCI DMA not available.\n"); | 286 | printk(KERN_WARNING DRV_NAME ": 32-bit PCI DMA not available.\n"); |
287 | err = -ENODEV; | 287 | err = -ENODEV; |
288 | goto err_out_free; | 288 | goto err_out_free; |
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index c61a01b029af..264e61404f34 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
@@ -375,7 +375,7 @@ static int __devinit w840_probe1 (struct pci_dev *pdev, | |||
375 | 375 | ||
376 | irq = pdev->irq; | 376 | irq = pdev->irq; |
377 | 377 | ||
378 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { | 378 | if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) { |
379 | printk(KERN_WARNING "Winbond-840: Device %s disabled due to DMA limitations.\n", | 379 | printk(KERN_WARNING "Winbond-840: Device %s disabled due to DMA limitations.\n", |
380 | pci_name(pdev)); | 380 | pci_name(pdev)); |
381 | return -EIO; | 381 | return -EIO; |