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 | 6afd142fd0dfba497246d0fab236c20a7b4bf778 (patch) | |
tree | f45bf4da587d94acfa1aa1fd35b611d8828689bc /drivers/net/forcedeth.c | |
parent | 50cf156af7dc68a44409bef636585ef88ebbab34 (diff) |
dma-mapping: replace all DMA_39BIT_MASK macro with DMA_BIT_MASK(39)
Replace all DMA_39BIT_MASK macro with DMA_BIT_MASK(39)
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/forcedeth.c')
-rw-r--r-- | drivers/net/forcedeth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 663a7b3261ee..d37465020bcc 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -5632,12 +5632,12 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
5632 | np->desc_ver = DESC_VER_3; | 5632 | np->desc_ver = DESC_VER_3; |
5633 | np->txrxctl_bits = NVREG_TXRXCTL_DESC_3; | 5633 | np->txrxctl_bits = NVREG_TXRXCTL_DESC_3; |
5634 | if (dma_64bit) { | 5634 | if (dma_64bit) { |
5635 | if (pci_set_dma_mask(pci_dev, DMA_39BIT_MASK)) | 5635 | if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(39))) |
5636 | dev_printk(KERN_INFO, &pci_dev->dev, | 5636 | dev_printk(KERN_INFO, &pci_dev->dev, |
5637 | "64-bit DMA failed, using 32-bit addressing\n"); | 5637 | "64-bit DMA failed, using 32-bit addressing\n"); |
5638 | else | 5638 | else |
5639 | dev->features |= NETIF_F_HIGHDMA; | 5639 | dev->features |= NETIF_F_HIGHDMA; |
5640 | if (pci_set_consistent_dma_mask(pci_dev, DMA_39BIT_MASK)) { | 5640 | if (pci_set_consistent_dma_mask(pci_dev, DMA_BIT_MASK(39))) { |
5641 | dev_printk(KERN_INFO, &pci_dev->dev, | 5641 | dev_printk(KERN_INFO, &pci_dev->dev, |
5642 | "64-bit DMA (consistent) failed, using 32-bit ring buffers\n"); | 5642 | "64-bit DMA (consistent) failed, using 32-bit ring buffers\n"); |
5643 | } | 5643 | } |