aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/8139cp.c
diff options
context:
space:
mode:
authorYang Hongyang <yanghy@cn.fujitsu.com>2009-04-06 22:01:15 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 11:31:11 -0400
commit284901a90a9e0b812ca3f5f852cbbfb60d10249d (patch)
tree06c1b5a0f83c90cfb662f756e7781977ce739ce8 /drivers/net/8139cp.c
parent6afd142fd0dfba497246d0fab236c20a7b4bf778 (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/8139cp.c')
-rw-r--r--drivers/net/8139cp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index d08475a7f676..02330f3d5a55 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1530,7 +1530,7 @@ static void cp_get_ethtool_stats (struct net_device *dev,
1530 1530
1531 /* begin NIC statistics dump */ 1531 /* begin NIC statistics dump */
1532 cpw32(StatsAddr + 4, (u64)dma >> 32); 1532 cpw32(StatsAddr + 4, (u64)dma >> 32);
1533 cpw32(StatsAddr, ((u64)dma & DMA_32BIT_MASK) | DumpStats); 1533 cpw32(StatsAddr, ((u64)dma & DMA_BIT_MASK(32)) | DumpStats);
1534 cpr32(StatsAddr); 1534 cpr32(StatsAddr);
1535 1535
1536 for (i = 0; i < 1000; i++) { 1536 for (i = 0; i < 1000; i++) {
@@ -1935,13 +1935,13 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
1935 } else { 1935 } else {
1936 pci_using_dac = 0; 1936 pci_using_dac = 0;
1937 1937
1938 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 1938 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
1939 if (rc) { 1939 if (rc) {
1940 dev_err(&pdev->dev, 1940 dev_err(&pdev->dev,
1941 "No usable DMA configuration, aborting.\n"); 1941 "No usable DMA configuration, aborting.\n");
1942 goto err_out_res; 1942 goto err_out_res;
1943 } 1943 }
1944 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 1944 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
1945 if (rc) { 1945 if (rc) {
1946 dev_err(&pdev->dev, 1946 dev_err(&pdev->dev,
1947 "No usable consistent DMA configuration, " 1947 "No usable consistent DMA configuration, "