aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-03-14 09:07:21 -0400
committerDavid S. Miller <davem@davemloft.net>2013-03-15 08:56:58 -0400
commitd0320f750093d012d3ed69fc1e8b385f654523d5 (patch)
tree1f9c25c892c33275fb85a993e9a274dc5618370b /drivers/net
parent68c45a2da34cb44962c6a48f8e474ec6b7853641 (diff)
drivers:net: Remove dma_alloc_coherent OOM messages
I believe these error messages are already logged on allocation failure by warn_alloc_failed and so get a dump_stack on OOM. Remove the unnecessary additional error logging. Around these deletions: o Alignment neatening. o Remove unnecessary casts of dma_alloc_coherent. o Hoist assigns from ifs. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/aeroflex/greth.c20
-rw-r--r--drivers/net/ethernet/amd/sunlance.c5
-rw-r--r--drivers/net/ethernet/apple/macmace.c16
-rw-r--r--drivers/net/ethernet/broadcom/bcm63xx_enet.c2
-rw-r--r--drivers/net/ethernet/cadence/at91_ether.c19
-rw-r--r--drivers/net/ethernet/dec/tulip/xircom_cb.c9
-rw-r--r--drivers/net/ethernet/emulex/benet/be_cmds.c4
-rw-r--r--drivers/net/ethernet/emulex/benet/be_ethtool.c9
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c6
-rw-r--r--drivers/net/ethernet/freescale/fec.c6
-rw-r--r--drivers/net/ethernet/freescale/gianfar.c13
-rw-r--r--drivers/net/ethernet/ibm/emac/mal.c8
-rw-r--r--drivers/net/ethernet/ibm/ibmveth.c6
-rw-r--r--drivers/net/ethernet/intel/e1000/e1000_main.c7
-rw-r--r--drivers/net/ethernet/intel/ixgb/ixgb_main.c4
-rw-r--r--drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c3
-rw-r--r--drivers/net/ethernet/marvell/mvneta.c14
-rw-r--r--drivers/net/ethernet/marvell/pxa168_eth.c11
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/cmd.c4
-rw-r--r--drivers/net/ethernet/natsemi/jazzsonic.c12
-rw-r--r--drivers/net/ethernet/natsemi/macsonic.c12
-rw-r--r--drivers/net/ethernet/natsemi/xtsonic.c12
-rw-r--r--drivers/net/ethernet/nuvoton/w90p910_ether.c19
-rw-r--r--drivers/net/ethernet/nxp/lpc_eth.c2
-rw-r--r--drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c12
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c40
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c5
-rw-r--r--drivers/net/ethernet/renesas/sh_eth.c9
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_main.c24
-rw-r--r--drivers/net/ethernet/sun/sunbmac.c4
-rw-r--r--drivers/net/ethernet/sun/sunhme.c13
-rw-r--r--drivers/net/ethernet/tundra/tsi108_eth.c10
-rw-r--r--drivers/net/ethernet/xilinx/ll_temac_main.c11
-rw-r--r--drivers/net/ethernet/xilinx/xilinx_axienet_main.c10
-rw-r--r--drivers/net/fddi/defxx.c6
-rw-r--r--drivers/net/irda/bfin_sir.c3
-rw-r--r--drivers/net/irda/smsc-ircc2.c10
-rw-r--r--drivers/net/wireless/ath/wil6210/txrx.c2
-rw-r--r--drivers/net/wireless/b43legacy/dma.c5
-rw-r--r--drivers/net/wireless/iwlegacy/3945.c4
-rw-r--r--drivers/net/wireless/iwlegacy/common.c5
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/tx.c4
42 files changed, 122 insertions, 278 deletions
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
index 0be2195e5034..3a9fbacc3729 100644
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -1464,14 +1464,10 @@ static int greth_of_probe(struct platform_device *ofdev)
1464 } 1464 }
1465 1465
1466 /* Allocate TX descriptor ring in coherent memory */ 1466 /* Allocate TX descriptor ring in coherent memory */
1467 greth->tx_bd_base = (struct greth_bd *) dma_alloc_coherent(greth->dev, 1467 greth->tx_bd_base = dma_alloc_coherent(greth->dev, 1024,
1468 1024, 1468 &greth->tx_bd_base_phys,
1469 &greth->tx_bd_base_phys, 1469 GFP_KERNEL);
1470 GFP_KERNEL);
1471
1472 if (!greth->tx_bd_base) { 1470 if (!greth->tx_bd_base) {
1473 if (netif_msg_probe(greth))
1474 dev_err(&dev->dev, "could not allocate descriptor memory.\n");
1475 err = -ENOMEM; 1471 err = -ENOMEM;
1476 goto error3; 1472 goto error3;
1477 } 1473 }
@@ -1479,14 +1475,10 @@ static int greth_of_probe(struct platform_device *ofdev)
1479 memset(greth->tx_bd_base, 0, 1024); 1475 memset(greth->tx_bd_base, 0, 1024);
1480 1476
1481 /* Allocate RX descriptor ring in coherent memory */ 1477 /* Allocate RX descriptor ring in coherent memory */
1482 greth->rx_bd_base = (struct greth_bd *) dma_alloc_coherent(greth->dev, 1478 greth->rx_bd_base = dma_alloc_coherent(greth->dev, 1024,
1483 1024, 1479 &greth->rx_bd_base_phys,
1484 &greth->rx_bd_base_phys, 1480 GFP_KERNEL);
1485 GFP_KERNEL);
1486
1487 if (!greth->rx_bd_base) { 1481 if (!greth->rx_bd_base) {
1488 if (netif_msg_probe(greth))
1489 dev_err(greth->dev, "could not allocate descriptor memory.\n");
1490 err = -ENOMEM; 1482 err = -ENOMEM;
1491 goto error4; 1483 goto error4;
1492 } 1484 }
diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c
index 70d543063993..f47b780892e9 100644
--- a/drivers/net/ethernet/amd/sunlance.c
+++ b/drivers/net/ethernet/amd/sunlance.c
@@ -1373,10 +1373,9 @@ static int sparc_lance_probe_one(struct platform_device *op,
1373 dma_alloc_coherent(&op->dev, 1373 dma_alloc_coherent(&op->dev,
1374 sizeof(struct lance_init_block), 1374 sizeof(struct lance_init_block),
1375 &lp->init_block_dvma, GFP_ATOMIC); 1375 &lp->init_block_dvma, GFP_ATOMIC);
1376 if (!lp->init_block_mem) { 1376 if (!lp->init_block_mem)
1377 printk(KERN_ERR "SunLance: Cannot allocate consistent DMA memory.\n");
1378 goto fail; 1377 goto fail;
1379 } 1378
1380 lp->pio_buffer = 0; 1379 lp->pio_buffer = 0;
1381 lp->init_ring = lance_init_ring_dvma; 1380 lp->init_ring = lance_init_ring_dvma;
1382 lp->rx = lance_rx_dvma; 1381 lp->rx = lance_rx_dvma;
diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c
index a206779c68cf..4ce8ceb62205 100644
--- a/drivers/net/ethernet/apple/macmace.c
+++ b/drivers/net/ethernet/apple/macmace.c
@@ -386,20 +386,16 @@ static int mace_open(struct net_device *dev)
386 /* Allocate the DMA ring buffers */ 386 /* Allocate the DMA ring buffers */
387 387
388 mp->tx_ring = dma_alloc_coherent(mp->device, 388 mp->tx_ring = dma_alloc_coherent(mp->device,
389 N_TX_RING * MACE_BUFF_SIZE, 389 N_TX_RING * MACE_BUFF_SIZE,
390 &mp->tx_ring_phys, GFP_KERNEL); 390 &mp->tx_ring_phys, GFP_KERNEL);
391 if (mp->tx_ring == NULL) { 391 if (mp->tx_ring == NULL)
392 printk(KERN_ERR "%s: unable to allocate DMA tx buffers\n", dev->name);
393 goto out1; 392 goto out1;
394 }
395 393
396 mp->rx_ring = dma_alloc_coherent(mp->device, 394 mp->rx_ring = dma_alloc_coherent(mp->device,
397 N_RX_RING * MACE_BUFF_SIZE, 395 N_RX_RING * MACE_BUFF_SIZE,
398 &mp->rx_ring_phys, GFP_KERNEL); 396 &mp->rx_ring_phys, GFP_KERNEL);
399 if (mp->rx_ring == NULL) { 397 if (mp->rx_ring == NULL)
400 printk(KERN_ERR "%s: unable to allocate DMA rx buffers\n", dev->name);
401 goto out2; 398 goto out2;
402 }
403 399
404 mace_dma_off(dev); 400 mace_dma_off(dev);
405 401
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index db343a1d0835..79cf620ab449 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -864,7 +864,6 @@ static int bcm_enet_open(struct net_device *dev)
864 size = priv->rx_ring_size * sizeof(struct bcm_enet_desc); 864 size = priv->rx_ring_size * sizeof(struct bcm_enet_desc);
865 p = dma_alloc_coherent(kdev, size, &priv->rx_desc_dma, GFP_KERNEL); 865 p = dma_alloc_coherent(kdev, size, &priv->rx_desc_dma, GFP_KERNEL);
866 if (!p) { 866 if (!p) {
867 dev_err(kdev, "cannot allocate rx ring %u\n", size);
868 ret = -ENOMEM; 867 ret = -ENOMEM;
869 goto out_freeirq_tx; 868 goto out_freeirq_tx;
870 } 869 }
@@ -877,7 +876,6 @@ static int bcm_enet_open(struct net_device *dev)
877 size = priv->tx_ring_size * sizeof(struct bcm_enet_desc); 876 size = priv->tx_ring_size * sizeof(struct bcm_enet_desc);
878 p = dma_alloc_coherent(kdev, size, &priv->tx_desc_dma, GFP_KERNEL); 877 p = dma_alloc_coherent(kdev, size, &priv->tx_desc_dma, GFP_KERNEL);
879 if (!p) { 878 if (!p) {
880 dev_err(kdev, "cannot allocate tx ring\n");
881 ret = -ENOMEM; 879 ret = -ENOMEM;
882 goto out_free_rx_ring; 880 goto out_free_rx_ring;
883 } 881 }
diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c
index 5bd7786e8413..c6e40d65a3df 100644
--- a/drivers/net/ethernet/cadence/at91_ether.c
+++ b/drivers/net/ethernet/cadence/at91_ether.c
@@ -47,22 +47,19 @@ static int at91ether_start(struct net_device *dev)
47 int i; 47 int i;
48 48
49 lp->rx_ring = dma_alloc_coherent(&lp->pdev->dev, 49 lp->rx_ring = dma_alloc_coherent(&lp->pdev->dev,
50 MAX_RX_DESCR * sizeof(struct macb_dma_desc), 50 (MAX_RX_DESCR *
51 &lp->rx_ring_dma, GFP_KERNEL); 51 sizeof(struct macb_dma_desc)),
52 if (!lp->rx_ring) { 52 &lp->rx_ring_dma, GFP_KERNEL);
53 netdev_err(dev, "unable to alloc rx ring DMA buffer\n"); 53 if (!lp->rx_ring)
54 return -ENOMEM; 54 return -ENOMEM;
55 }
56 55
57 lp->rx_buffers = dma_alloc_coherent(&lp->pdev->dev, 56 lp->rx_buffers = dma_alloc_coherent(&lp->pdev->dev,
58 MAX_RX_DESCR * MAX_RBUFF_SZ, 57 MAX_RX_DESCR * MAX_RBUFF_SZ,
59 &lp->rx_buffers_dma, GFP_KERNEL); 58 &lp->rx_buffers_dma, GFP_KERNEL);
60 if (!lp->rx_buffers) { 59 if (!lp->rx_buffers) {
61 netdev_err(dev, "unable to alloc rx data DMA buffer\n");
62
63 dma_free_coherent(&lp->pdev->dev, 60 dma_free_coherent(&lp->pdev->dev,
64 MAX_RX_DESCR * sizeof(struct macb_dma_desc), 61 MAX_RX_DESCR * sizeof(struct macb_dma_desc),
65 lp->rx_ring, lp->rx_ring_dma); 62 lp->rx_ring, lp->rx_ring_dma);
66 lp->rx_ring = NULL; 63 lp->rx_ring = NULL;
67 return -ENOMEM; 64 return -ENOMEM;
68 } 65 }
diff --git a/drivers/net/ethernet/dec/tulip/xircom_cb.c b/drivers/net/ethernet/dec/tulip/xircom_cb.c
index 88feced9a629..cdbcd1643141 100644
--- a/drivers/net/ethernet/dec/tulip/xircom_cb.c
+++ b/drivers/net/ethernet/dec/tulip/xircom_cb.c
@@ -236,17 +236,14 @@ static int xircom_probe(struct pci_dev *pdev, const struct pci_device_id *id)
236 private->rx_buffer = dma_alloc_coherent(d, 8192, 236 private->rx_buffer = dma_alloc_coherent(d, 8192,
237 &private->rx_dma_handle, 237 &private->rx_dma_handle,
238 GFP_KERNEL); 238 GFP_KERNEL);
239 if (private->rx_buffer == NULL) { 239 if (private->rx_buffer == NULL)
240 pr_err("%s: no memory for rx buffer\n", __func__);
241 goto rx_buf_fail; 240 goto rx_buf_fail;
242 } 241
243 private->tx_buffer = dma_alloc_coherent(d, 8192, 242 private->tx_buffer = dma_alloc_coherent(d, 8192,
244 &private->tx_dma_handle, 243 &private->tx_dma_handle,
245 GFP_KERNEL); 244 GFP_KERNEL);
246 if (private->tx_buffer == NULL) { 245 if (private->tx_buffer == NULL)
247 pr_err("%s: no memory for tx buffer\n", __func__);
248 goto tx_buf_fail; 246 goto tx_buf_fail;
249 }
250 247
251 SET_NETDEV_DEV(dev, &pdev->dev); 248 SET_NETDEV_DEV(dev, &pdev->dev);
252 249
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 99163646113f..f286ad2da1ff 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -2667,10 +2667,8 @@ int be_cmd_set_mac_list(struct be_adapter *adapter, u8 *mac_array,
2667 cmd.size = sizeof(struct be_cmd_req_set_mac_list); 2667 cmd.size = sizeof(struct be_cmd_req_set_mac_list);
2668 cmd.va = dma_alloc_coherent(&adapter->pdev->dev, cmd.size, 2668 cmd.va = dma_alloc_coherent(&adapter->pdev->dev, cmd.size,
2669 &cmd.dma, GFP_KERNEL); 2669 &cmd.dma, GFP_KERNEL);
2670 if (!cmd.va) { 2670 if (!cmd.va)
2671 dev_err(&adapter->pdev->dev, "Memory alloc failure\n");
2672 return -ENOMEM; 2671 return -ENOMEM;
2673 }
2674 2672
2675 spin_lock_bh(&adapter->mcc_lock); 2673 spin_lock_bh(&adapter->mcc_lock);
2676 2674
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 053f00d006c0..07b7f27cb0b9 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -719,10 +719,8 @@ be_test_ddr_dma(struct be_adapter *adapter)
719 ddrdma_cmd.size = sizeof(struct be_cmd_req_ddrdma_test); 719 ddrdma_cmd.size = sizeof(struct be_cmd_req_ddrdma_test);
720 ddrdma_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, ddrdma_cmd.size, 720 ddrdma_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, ddrdma_cmd.size,
721 &ddrdma_cmd.dma, GFP_KERNEL); 721 &ddrdma_cmd.dma, GFP_KERNEL);
722 if (!ddrdma_cmd.va) { 722 if (!ddrdma_cmd.va)
723 dev_err(&adapter->pdev->dev, "Memory allocation failure\n");
724 return -ENOMEM; 723 return -ENOMEM;
725 }
726 724
727 for (i = 0; i < 2; i++) { 725 for (i = 0; i < 2; i++) {
728 ret = be_cmd_ddr_dma_test(adapter, pattern[i], 726 ret = be_cmd_ddr_dma_test(adapter, pattern[i],
@@ -845,11 +843,8 @@ be_read_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,
845 eeprom_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, eeprom_cmd.size, 843 eeprom_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, eeprom_cmd.size,
846 &eeprom_cmd.dma, GFP_KERNEL); 844 &eeprom_cmd.dma, GFP_KERNEL);
847 845
848 if (!eeprom_cmd.va) { 846 if (!eeprom_cmd.va)
849 dev_err(&adapter->pdev->dev,
850 "Memory allocation failure. Could not read eeprom\n");
851 return -ENOMEM; 847 return -ENOMEM;
852 }
853 848
854 status = be_cmd_get_seeprom_data(adapter, &eeprom_cmd); 849 status = be_cmd_get_seeprom_data(adapter, &eeprom_cmd);
855 850
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index c71b180f4678..2dfa205c5b99 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -3464,11 +3464,9 @@ static int lancer_fw_download(struct be_adapter *adapter,
3464 flash_cmd.size = sizeof(struct lancer_cmd_req_write_object) 3464 flash_cmd.size = sizeof(struct lancer_cmd_req_write_object)
3465 + LANCER_FW_DOWNLOAD_CHUNK; 3465 + LANCER_FW_DOWNLOAD_CHUNK;
3466 flash_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, flash_cmd.size, 3466 flash_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, flash_cmd.size,
3467 &flash_cmd.dma, GFP_KERNEL); 3467 &flash_cmd.dma, GFP_KERNEL);
3468 if (!flash_cmd.va) { 3468 if (!flash_cmd.va) {
3469 status = -ENOMEM; 3469 status = -ENOMEM;
3470 dev_err(&adapter->pdev->dev,
3471 "Memory allocation failure while flashing\n");
3472 goto lancer_fw_exit; 3470 goto lancer_fw_exit;
3473 } 3471 }
3474 3472
@@ -3570,8 +3568,6 @@ static int be_fw_download(struct be_adapter *adapter, const struct firmware* fw)
3570 &flash_cmd.dma, GFP_KERNEL); 3568 &flash_cmd.dma, GFP_KERNEL);
3571 if (!flash_cmd.va) { 3569 if (!flash_cmd.va) {
3572 status = -ENOMEM; 3570 status = -ENOMEM;
3573 dev_err(&adapter->pdev->dev,
3574 "Memory allocation failure while flashing\n");
3575 goto be_fw_exit; 3571 goto be_fw_exit;
3576 } 3572 }
3577 3573
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index e6224949891f..69a4adedad83 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -1594,11 +1594,9 @@ static int fec_enet_init(struct net_device *ndev)
1594 1594
1595 /* Allocate memory for buffer descriptors. */ 1595 /* Allocate memory for buffer descriptors. */
1596 cbd_base = dma_alloc_coherent(NULL, PAGE_SIZE, &fep->bd_dma, 1596 cbd_base = dma_alloc_coherent(NULL, PAGE_SIZE, &fep->bd_dma,
1597 GFP_KERNEL); 1597 GFP_KERNEL);
1598 if (!cbd_base) { 1598 if (!cbd_base)
1599 printk("FEC: allocate descriptor memory failed?\n");
1600 return -ENOMEM; 1599 return -ENOMEM;
1601 }
1602 1600
1603 spin_lock_init(&fep->hw_lock); 1601 spin_lock_init(&fep->hw_lock);
1604 1602
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index d2c5441d1bf0..1b468a82a68f 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -245,14 +245,13 @@ static int gfar_alloc_skb_resources(struct net_device *ndev)
245 245
246 /* Allocate memory for the buffer descriptors */ 246 /* Allocate memory for the buffer descriptors */
247 vaddr = dma_alloc_coherent(dev, 247 vaddr = dma_alloc_coherent(dev,
248 sizeof(struct txbd8) * priv->total_tx_ring_size + 248 (priv->total_tx_ring_size *
249 sizeof(struct rxbd8) * priv->total_rx_ring_size, 249 sizeof(struct txbd8)) +
250 &addr, GFP_KERNEL); 250 (priv->total_rx_ring_size *
251 if (!vaddr) { 251 sizeof(struct rxbd8)),
252 netif_err(priv, ifup, ndev, 252 &addr, GFP_KERNEL);
253 "Could not allocate buffer descriptors!\n"); 253 if (!vaddr)
254 return -ENOMEM; 254 return -ENOMEM;
255 }
256 255
257 for (i = 0; i < priv->num_tx_queues; i++) { 256 for (i = 0; i < priv->num_tx_queues; i++) {
258 tx_queue = priv->tx_queue[i]; 257 tx_queue = priv->tx_queue[i];
diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c
index 1f7ecf57181e..cc2db5c04d9c 100644
--- a/drivers/net/ethernet/ibm/emac/mal.c
+++ b/drivers/net/ethernet/ibm/emac/mal.c
@@ -637,13 +637,9 @@ static int mal_probe(struct platform_device *ofdev)
637 bd_size = sizeof(struct mal_descriptor) * 637 bd_size = sizeof(struct mal_descriptor) *
638 (NUM_TX_BUFF * mal->num_tx_chans + 638 (NUM_TX_BUFF * mal->num_tx_chans +
639 NUM_RX_BUFF * mal->num_rx_chans); 639 NUM_RX_BUFF * mal->num_rx_chans);
640 mal->bd_virt = 640 mal->bd_virt = dma_alloc_coherent(&ofdev->dev, bd_size, &mal->bd_dma,
641 dma_alloc_coherent(&ofdev->dev, bd_size, &mal->bd_dma, 641 GFP_KERNEL);
642 GFP_KERNEL);
643 if (mal->bd_virt == NULL) { 642 if (mal->bd_virt == NULL) {
644 printk(KERN_ERR
645 "mal%d: out of memory allocating RX/TX descriptors!\n",
646 index);
647 err = -ENOMEM; 643 err = -ENOMEM;
648 goto fail_unmap; 644 goto fail_unmap;
649 } 645 }
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index c859771a9902..302d59401065 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -556,11 +556,9 @@ static int ibmveth_open(struct net_device *netdev)
556 adapter->rx_queue.queue_len = sizeof(struct ibmveth_rx_q_entry) * 556 adapter->rx_queue.queue_len = sizeof(struct ibmveth_rx_q_entry) *
557 rxq_entries; 557 rxq_entries;
558 adapter->rx_queue.queue_addr = 558 adapter->rx_queue.queue_addr =
559 dma_alloc_coherent(dev, adapter->rx_queue.queue_len, 559 dma_alloc_coherent(dev, adapter->rx_queue.queue_len,
560 &adapter->rx_queue.queue_dma, GFP_KERNEL); 560 &adapter->rx_queue.queue_dma, GFP_KERNEL);
561
562 if (!adapter->rx_queue.queue_addr) { 561 if (!adapter->rx_queue.queue_addr) {
563 netdev_err(netdev, "unable to allocate rx queue pages\n");
564 rc = -ENOMEM; 562 rc = -ENOMEM;
565 goto err_out; 563 goto err_out;
566 } 564 }
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 8502c625dbef..d98e1d0996d4 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -1516,8 +1516,6 @@ static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
1516 if (!txdr->desc) { 1516 if (!txdr->desc) {
1517setup_tx_desc_die: 1517setup_tx_desc_die:
1518 vfree(txdr->buffer_info); 1518 vfree(txdr->buffer_info);
1519 e_err(probe, "Unable to allocate memory for the Tx descriptor "
1520 "ring\n");
1521 return -ENOMEM; 1519 return -ENOMEM;
1522 } 1520 }
1523 1521
@@ -1707,10 +1705,7 @@ static int e1000_setup_rx_resources(struct e1000_adapter *adapter,
1707 1705
1708 rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma, 1706 rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
1709 GFP_KERNEL); 1707 GFP_KERNEL);
1710
1711 if (!rxdr->desc) { 1708 if (!rxdr->desc) {
1712 e_err(probe, "Unable to allocate memory for the Rx descriptor "
1713 "ring\n");
1714setup_rx_desc_die: 1709setup_rx_desc_die:
1715 vfree(rxdr->buffer_info); 1710 vfree(rxdr->buffer_info);
1716 return -ENOMEM; 1711 return -ENOMEM;
@@ -1729,8 +1724,6 @@ setup_rx_desc_die:
1729 if (!rxdr->desc) { 1724 if (!rxdr->desc) {
1730 dma_free_coherent(&pdev->dev, rxdr->size, olddesc, 1725 dma_free_coherent(&pdev->dev, rxdr->size, olddesc,
1731 olddma); 1726 olddma);
1732 e_err(probe, "Unable to allocate memory for the Rx "
1733 "descriptor ring\n");
1734 goto setup_rx_desc_die; 1727 goto setup_rx_desc_die;
1735 } 1728 }
1736 1729
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index ea4808373435..e23f0234cb27 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -720,8 +720,6 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter)
720 GFP_KERNEL); 720 GFP_KERNEL);
721 if (!txdr->desc) { 721 if (!txdr->desc) {
722 vfree(txdr->buffer_info); 722 vfree(txdr->buffer_info);
723 netif_err(adapter, probe, adapter->netdev,
724 "Unable to allocate transmit descriptor memory\n");
725 return -ENOMEM; 723 return -ENOMEM;
726 } 724 }
727 memset(txdr->desc, 0, txdr->size); 725 memset(txdr->desc, 0, txdr->size);
@@ -807,8 +805,6 @@ ixgb_setup_rx_resources(struct ixgb_adapter *adapter)
807 805
808 if (!rxdr->desc) { 806 if (!rxdr->desc) {
809 vfree(rxdr->buffer_info); 807 vfree(rxdr->buffer_info);
810 netif_err(adapter, probe, adapter->netdev,
811 "Unable to allocate receive descriptors\n");
812 return -ENOMEM; 808 return -ENOMEM;
813 } 809 }
814 memset(rxdr->desc, 0, rxdr->size); 810 memset(rxdr->desc, 0, rxdr->size);
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 2635b8303515..ac0c315659de 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -2423,9 +2423,6 @@ int ixgbevf_setup_rx_resources(struct ixgbevf_adapter *adapter,
2423 &rx_ring->dma, GFP_KERNEL); 2423 &rx_ring->dma, GFP_KERNEL);
2424 2424
2425 if (!rx_ring->desc) { 2425 if (!rx_ring->desc) {
2426 hw_dbg(&adapter->hw,
2427 "Unable to allocate memory for "
2428 "the receive descriptor ring\n");
2429 vfree(rx_ring->rx_buffer_info); 2426 vfree(rx_ring->rx_buffer_info);
2430 rx_ring->rx_buffer_info = NULL; 2427 rx_ring->rx_buffer_info = NULL;
2431 goto alloc_failed; 2428 goto alloc_failed;
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index cd345b8969bc..e48261e468f3 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -1969,13 +1969,8 @@ static int mvneta_rxq_init(struct mvneta_port *pp,
1969 rxq->descs = dma_alloc_coherent(pp->dev->dev.parent, 1969 rxq->descs = dma_alloc_coherent(pp->dev->dev.parent,
1970 rxq->size * MVNETA_DESC_ALIGNED_SIZE, 1970 rxq->size * MVNETA_DESC_ALIGNED_SIZE,
1971 &rxq->descs_phys, GFP_KERNEL); 1971 &rxq->descs_phys, GFP_KERNEL);
1972 if (rxq->descs == NULL) { 1972 if (rxq->descs == NULL)
1973 netdev_err(pp->dev,
1974 "rxq=%d: Can't allocate %d bytes for %d RX descr\n",
1975 rxq->id, rxq->size * MVNETA_DESC_ALIGNED_SIZE,
1976 rxq->size);
1977 return -ENOMEM; 1973 return -ENOMEM;
1978 }
1979 1974
1980 BUG_ON(rxq->descs != 1975 BUG_ON(rxq->descs !=
1981 PTR_ALIGN(rxq->descs, MVNETA_CPU_D_CACHE_LINE_SIZE)); 1976 PTR_ALIGN(rxq->descs, MVNETA_CPU_D_CACHE_LINE_SIZE));
@@ -2029,13 +2024,8 @@ static int mvneta_txq_init(struct mvneta_port *pp,
2029 txq->descs = dma_alloc_coherent(pp->dev->dev.parent, 2024 txq->descs = dma_alloc_coherent(pp->dev->dev.parent,
2030 txq->size * MVNETA_DESC_ALIGNED_SIZE, 2025 txq->size * MVNETA_DESC_ALIGNED_SIZE,
2031 &txq->descs_phys, GFP_KERNEL); 2026 &txq->descs_phys, GFP_KERNEL);
2032 if (txq->descs == NULL) { 2027 if (txq->descs == NULL)
2033 netdev_err(pp->dev,
2034 "txQ=%d: Can't allocate %d bytes for %d TX descr\n",
2035 txq->id, txq->size * MVNETA_DESC_ALIGNED_SIZE,
2036 txq->size);
2037 return -ENOMEM; 2028 return -ENOMEM;
2038 }
2039 2029
2040 /* Make sure descriptor address is cache line size aligned */ 2030 /* Make sure descriptor address is cache line size aligned */
2041 BUG_ON(txq->descs != 2031 BUG_ON(txq->descs !=
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 037ed866c22f..3ae4c7f0834d 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1024,11 +1024,9 @@ static int rxq_init(struct net_device *dev)
1024 pep->rx_desc_area_size = size; 1024 pep->rx_desc_area_size = size;
1025 pep->p_rx_desc_area = dma_alloc_coherent(pep->dev->dev.parent, size, 1025 pep->p_rx_desc_area = dma_alloc_coherent(pep->dev->dev.parent, size,
1026 &pep->rx_desc_dma, GFP_KERNEL); 1026 &pep->rx_desc_dma, GFP_KERNEL);
1027 if (!pep->p_rx_desc_area) { 1027 if (!pep->p_rx_desc_area)
1028 printk(KERN_ERR "%s: Cannot alloc RX ring (size %d bytes)\n",
1029 dev->name, size);
1030 goto out; 1028 goto out;
1031 } 1029
1032 memset((void *)pep->p_rx_desc_area, 0, size); 1030 memset((void *)pep->p_rx_desc_area, 0, size);
1033 /* initialize the next_desc_ptr links in the Rx descriptors ring */ 1031 /* initialize the next_desc_ptr links in the Rx descriptors ring */
1034 p_rx_desc = pep->p_rx_desc_area; 1032 p_rx_desc = pep->p_rx_desc_area;
@@ -1087,11 +1085,8 @@ static int txq_init(struct net_device *dev)
1087 pep->tx_desc_area_size = size; 1085 pep->tx_desc_area_size = size;
1088 pep->p_tx_desc_area = dma_alloc_coherent(pep->dev->dev.parent, size, 1086 pep->p_tx_desc_area = dma_alloc_coherent(pep->dev->dev.parent, size,
1089 &pep->tx_desc_dma, GFP_KERNEL); 1087 &pep->tx_desc_dma, GFP_KERNEL);
1090 if (!pep->p_tx_desc_area) { 1088 if (!pep->p_tx_desc_area)
1091 printk(KERN_ERR "%s: Cannot allocate Tx Ring (size %d bytes)\n",
1092 dev->name, size);
1093 goto out; 1089 goto out;
1094 }
1095 memset((void *)pep->p_tx_desc_area, 0, pep->tx_desc_area_size); 1090 memset((void *)pep->p_tx_desc_area, 0, pep->tx_desc_area_size);
1096 /* Initialize the next_desc_ptr links in the Tx descriptors ring */ 1091 /* Initialize the next_desc_ptr links in the Tx descriptors ring */
1097 p_tx_desc = pep->p_tx_desc_area; 1092 p_tx_desc = pep->p_tx_desc_area;
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index fdc5f23d8e9f..05267d716e86 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1837,10 +1837,8 @@ int mlx4_cmd_init(struct mlx4_dev *dev)
1837 priv->mfunc.vhcr = dma_alloc_coherent(&(dev->pdev->dev), PAGE_SIZE, 1837 priv->mfunc.vhcr = dma_alloc_coherent(&(dev->pdev->dev), PAGE_SIZE,
1838 &priv->mfunc.vhcr_dma, 1838 &priv->mfunc.vhcr_dma,
1839 GFP_KERNEL); 1839 GFP_KERNEL);
1840 if (!priv->mfunc.vhcr) { 1840 if (!priv->mfunc.vhcr)
1841 mlx4_err(dev, "Couldn't allocate VHCR.\n");
1842 goto err_hcr; 1841 goto err_hcr;
1843 }
1844 } 1842 }
1845 1843
1846 priv->cmd.pool = pci_pool_create("mlx4_cmd", dev->pdev, 1844 priv->cmd.pool = pci_pool_create("mlx4_cmd", dev->pdev,
diff --git a/drivers/net/ethernet/natsemi/jazzsonic.c b/drivers/net/ethernet/natsemi/jazzsonic.c
index b0b361546365..c20766c2f65b 100644
--- a/drivers/net/ethernet/natsemi/jazzsonic.c
+++ b/drivers/net/ethernet/natsemi/jazzsonic.c
@@ -175,13 +175,13 @@ static int sonic_probe1(struct net_device *dev)
175 175
176 /* Allocate the entire chunk of memory for the descriptors. 176 /* Allocate the entire chunk of memory for the descriptors.
177 Note that this cannot cross a 64K boundary. */ 177 Note that this cannot cross a 64K boundary. */
178 if ((lp->descriptors = dma_alloc_coherent(lp->device, 178 lp->descriptors = dma_alloc_coherent(lp->device,
179 SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode), 179 SIZEOF_SONIC_DESC *
180 &lp->descriptors_laddr, GFP_KERNEL)) == NULL) { 180 SONIC_BUS_SCALE(lp->dma_bitmode),
181 printk(KERN_ERR "%s: couldn't alloc DMA memory for descriptors.\n", 181 &lp->descriptors_laddr,
182 dev_name(lp->device)); 182 GFP_KERNEL);
183 if (lp->descriptors == NULL)
183 goto out; 184 goto out;
184 }
185 185
186 /* Now set up the pointers to point to the appropriate places */ 186 /* Now set up the pointers to point to the appropriate places */
187 lp->cda = lp->descriptors; 187 lp->cda = lp->descriptors;
diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c
index 0ffde69c8d01..346a4e025c34 100644
--- a/drivers/net/ethernet/natsemi/macsonic.c
+++ b/drivers/net/ethernet/natsemi/macsonic.c
@@ -202,13 +202,13 @@ static int macsonic_init(struct net_device *dev)
202 202
203 /* Allocate the entire chunk of memory for the descriptors. 203 /* Allocate the entire chunk of memory for the descriptors.
204 Note that this cannot cross a 64K boundary. */ 204 Note that this cannot cross a 64K boundary. */
205 if ((lp->descriptors = dma_alloc_coherent(lp->device, 205 lp->descriptors = dma_alloc_coherent(lp->device,
206 SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode), 206 SIZEOF_SONIC_DESC *
207 &lp->descriptors_laddr, GFP_KERNEL)) == NULL) { 207 SONIC_BUS_SCALE(lp->dma_bitmode),
208 printk(KERN_ERR "%s: couldn't alloc DMA memory for descriptors.\n", 208 &lp->descriptors_laddr,
209 dev_name(lp->device)); 209 GFP_KERNEL);
210 if (lp->descriptors == NULL)
210 return -ENOMEM; 211 return -ENOMEM;
211 }
212 212
213 /* Now set up the pointers to point to the appropriate places */ 213 /* Now set up the pointers to point to the appropriate places */
214 lp->cda = lp->descriptors; 214 lp->cda = lp->descriptors;
diff --git a/drivers/net/ethernet/natsemi/xtsonic.c b/drivers/net/ethernet/natsemi/xtsonic.c
index 5e4748e855f6..c2e0256fe3df 100644
--- a/drivers/net/ethernet/natsemi/xtsonic.c
+++ b/drivers/net/ethernet/natsemi/xtsonic.c
@@ -197,14 +197,12 @@ static int __init sonic_probe1(struct net_device *dev)
197 * We also allocate extra space for a pointer to allow freeing 197 * We also allocate extra space for a pointer to allow freeing
198 * this structure later on (in xtsonic_cleanup_module()). 198 * this structure later on (in xtsonic_cleanup_module()).
199 */ 199 */
200 lp->descriptors = 200 lp->descriptors = dma_alloc_coherent(lp->device,
201 dma_alloc_coherent(lp->device, 201 SIZEOF_SONIC_DESC *
202 SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode), 202 SONIC_BUS_SCALE(lp->dma_bitmode),
203 &lp->descriptors_laddr, GFP_KERNEL); 203 &lp->descriptors_laddr,
204 204 GFP_KERNEL);
205 if (lp->descriptors == NULL) { 205 if (lp->descriptors == NULL) {
206 printk(KERN_ERR "%s: couldn't alloc DMA memory for "
207 " descriptors.\n", dev_name(lp->device));
208 err = -ENOMEM; 206 err = -ENOMEM;
209 goto out; 207 goto out;
210 } 208 }
diff --git a/drivers/net/ethernet/nuvoton/w90p910_ether.c b/drivers/net/ethernet/nuvoton/w90p910_ether.c
index 539d2028e456..3df8287b7452 100644
--- a/drivers/net/ethernet/nuvoton/w90p910_ether.c
+++ b/drivers/net/ethernet/nuvoton/w90p910_ether.c
@@ -287,23 +287,16 @@ static int w90p910_init_desc(struct net_device *dev)
287 ether = netdev_priv(dev); 287 ether = netdev_priv(dev);
288 pdev = ether->pdev; 288 pdev = ether->pdev;
289 289
290 ether->tdesc = (struct tran_pdesc *) 290 ether->tdesc = dma_alloc_coherent(&pdev->dev, sizeof(struct tran_pdesc),
291 dma_alloc_coherent(&pdev->dev, sizeof(struct tran_pdesc), 291 &ether->tdesc_phys, GFP_KERNEL);
292 &ether->tdesc_phys, GFP_KERNEL); 292 if (!ether->tdesc)
293
294 if (!ether->tdesc) {
295 dev_err(&pdev->dev, "Failed to allocate memory for tx desc\n");
296 return -ENOMEM; 293 return -ENOMEM;
297 }
298
299 ether->rdesc = (struct recv_pdesc *)
300 dma_alloc_coherent(&pdev->dev, sizeof(struct recv_pdesc),
301 &ether->rdesc_phys, GFP_KERNEL);
302 294
295 ether->rdesc = dma_alloc_coherent(&pdev->dev, sizeof(struct recv_pdesc),
296 &ether->rdesc_phys, GFP_KERNEL);
303 if (!ether->rdesc) { 297 if (!ether->rdesc) {
304 dev_err(&pdev->dev, "Failed to allocate memory for rx desc\n");
305 dma_free_coherent(&pdev->dev, sizeof(struct tran_pdesc), 298 dma_free_coherent(&pdev->dev, sizeof(struct tran_pdesc),
306 ether->tdesc, ether->tdesc_phys); 299 ether->tdesc, ether->tdesc_phys);
307 return -ENOMEM; 300 return -ENOMEM;
308 } 301 }
309 302
diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
index c4122c86f829..9c88c00c0a42 100644
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
@@ -1409,9 +1409,7 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)
1409 dma_alloc_coherent(&pldat->pdev->dev, 1409 dma_alloc_coherent(&pldat->pdev->dev,
1410 pldat->dma_buff_size, &dma_handle, 1410 pldat->dma_buff_size, &dma_handle,
1411 GFP_KERNEL); 1411 GFP_KERNEL);
1412
1413 if (pldat->dma_buff_base_v == NULL) { 1412 if (pldat->dma_buff_base_v == NULL) {
1414 dev_err(&pdev->dev, "error getting DMA region.\n");
1415 ret = -ENOMEM; 1413 ret = -ENOMEM;
1416 goto err_out_free_irq; 1414 goto err_out_free_irq;
1417 } 1415 }
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 39ab4d09faaa..4bdca9ec6a1a 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -1469,12 +1469,11 @@ pch_gbe_alloc_rx_buffers_pool(struct pch_gbe_adapter *adapter,
1469 1469
1470 size = rx_ring->count * bufsz + PCH_GBE_RESERVE_MEMORY; 1470 size = rx_ring->count * bufsz + PCH_GBE_RESERVE_MEMORY;
1471 rx_ring->rx_buff_pool = dma_alloc_coherent(&pdev->dev, size, 1471 rx_ring->rx_buff_pool = dma_alloc_coherent(&pdev->dev, size,
1472 &rx_ring->rx_buff_pool_logic, 1472 &rx_ring->rx_buff_pool_logic,
1473 GFP_KERNEL); 1473 GFP_KERNEL);
1474 if (!rx_ring->rx_buff_pool) { 1474 if (!rx_ring->rx_buff_pool)
1475 pr_err("Unable to allocate memory for the receive pool buffer\n");
1476 return -ENOMEM; 1475 return -ENOMEM;
1477 } 1476
1478 memset(rx_ring->rx_buff_pool, 0, size); 1477 memset(rx_ring->rx_buff_pool, 0, size);
1479 rx_ring->rx_buff_pool_size = size; 1478 rx_ring->rx_buff_pool_size = size;
1480 for (i = 0; i < rx_ring->count; i++) { 1479 for (i = 0; i < rx_ring->count; i++) {
@@ -1777,7 +1776,6 @@ int pch_gbe_setup_tx_resources(struct pch_gbe_adapter *adapter,
1777 &tx_ring->dma, GFP_KERNEL); 1776 &tx_ring->dma, GFP_KERNEL);
1778 if (!tx_ring->desc) { 1777 if (!tx_ring->desc) {
1779 vfree(tx_ring->buffer_info); 1778 vfree(tx_ring->buffer_info);
1780 pr_err("Unable to allocate memory for the transmit descriptor ring\n");
1781 return -ENOMEM; 1779 return -ENOMEM;
1782 } 1780 }
1783 memset(tx_ring->desc, 0, tx_ring->size); 1781 memset(tx_ring->desc, 0, tx_ring->size);
@@ -1821,9 +1819,7 @@ int pch_gbe_setup_rx_resources(struct pch_gbe_adapter *adapter,
1821 rx_ring->size = rx_ring->count * (int)sizeof(struct pch_gbe_rx_desc); 1819 rx_ring->size = rx_ring->count * (int)sizeof(struct pch_gbe_rx_desc);
1822 rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size, 1820 rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
1823 &rx_ring->dma, GFP_KERNEL); 1821 &rx_ring->dma, GFP_KERNEL);
1824
1825 if (!rx_ring->desc) { 1822 if (!rx_ring->desc) {
1826 pr_err("Unable to allocate memory for the receive descriptor ring\n");
1827 vfree(rx_ring->buffer_info); 1823 vfree(rx_ring->buffer_info);
1828 return -ENOMEM; 1824 return -ENOMEM;
1829 } 1825 }
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
index a69097c6b84d..a0649ece8e0a 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
@@ -532,20 +532,15 @@ int qlcnic_alloc_hw_resources(struct qlcnic_adapter *adapter)
532 ptr = (__le32 *)dma_alloc_coherent(&pdev->dev, sizeof(u32), 532 ptr = (__le32 *)dma_alloc_coherent(&pdev->dev, sizeof(u32),
533 &tx_ring->hw_cons_phys_addr, 533 &tx_ring->hw_cons_phys_addr,
534 GFP_KERNEL); 534 GFP_KERNEL);
535 535 if (ptr == NULL)
536 if (ptr == NULL) {
537 dev_err(&pdev->dev, "failed to allocate tx consumer\n");
538 return -ENOMEM; 536 return -ENOMEM;
539 } 537
540 tx_ring->hw_consumer = ptr; 538 tx_ring->hw_consumer = ptr;
541 /* cmd desc ring */ 539 /* cmd desc ring */
542 addr = dma_alloc_coherent(&pdev->dev, TX_DESC_RINGSIZE(tx_ring), 540 addr = dma_alloc_coherent(&pdev->dev, TX_DESC_RINGSIZE(tx_ring),
543 &tx_ring->phys_addr, 541 &tx_ring->phys_addr,
544 GFP_KERNEL); 542 GFP_KERNEL);
545
546 if (addr == NULL) { 543 if (addr == NULL) {
547 dev_err(&pdev->dev,
548 "failed to allocate tx desc ring\n");
549 err = -ENOMEM; 544 err = -ENOMEM;
550 goto err_out_free; 545 goto err_out_free;
551 } 546 }
@@ -556,11 +551,9 @@ int qlcnic_alloc_hw_resources(struct qlcnic_adapter *adapter)
556 for (ring = 0; ring < adapter->max_rds_rings; ring++) { 551 for (ring = 0; ring < adapter->max_rds_rings; ring++) {
557 rds_ring = &recv_ctx->rds_rings[ring]; 552 rds_ring = &recv_ctx->rds_rings[ring];
558 addr = dma_alloc_coherent(&adapter->pdev->dev, 553 addr = dma_alloc_coherent(&adapter->pdev->dev,
559 RCV_DESC_RINGSIZE(rds_ring), 554 RCV_DESC_RINGSIZE(rds_ring),
560 &rds_ring->phys_addr, GFP_KERNEL); 555 &rds_ring->phys_addr, GFP_KERNEL);
561 if (addr == NULL) { 556 if (addr == NULL) {
562 dev_err(&pdev->dev,
563 "failed to allocate rds ring [%d]\n", ring);
564 err = -ENOMEM; 557 err = -ENOMEM;
565 goto err_out_free; 558 goto err_out_free;
566 } 559 }
@@ -572,11 +565,9 @@ int qlcnic_alloc_hw_resources(struct qlcnic_adapter *adapter)
572 sds_ring = &recv_ctx->sds_rings[ring]; 565 sds_ring = &recv_ctx->sds_rings[ring];
573 566
574 addr = dma_alloc_coherent(&adapter->pdev->dev, 567 addr = dma_alloc_coherent(&adapter->pdev->dev,
575 STATUS_DESC_RINGSIZE(sds_ring), 568 STATUS_DESC_RINGSIZE(sds_ring),
576 &sds_ring->phys_addr, GFP_KERNEL); 569 &sds_ring->phys_addr, GFP_KERNEL);
577 if (addr == NULL) { 570 if (addr == NULL) {
578 dev_err(&pdev->dev,
579 "failed to allocate sds ring [%d]\n", ring);
580 err = -ENOMEM; 571 err = -ENOMEM;
581 goto err_out_free; 572 goto err_out_free;
582 } 573 }
@@ -753,7 +744,7 @@ int qlcnic_82xx_get_nic_info(struct qlcnic_adapter *adapter,
753 size_t nic_size = sizeof(struct qlcnic_info_le); 744 size_t nic_size = sizeof(struct qlcnic_info_le);
754 745
755 nic_info_addr = dma_alloc_coherent(&adapter->pdev->dev, nic_size, 746 nic_info_addr = dma_alloc_coherent(&adapter->pdev->dev, nic_size,
756 &nic_dma_t, GFP_KERNEL); 747 &nic_dma_t, GFP_KERNEL);
757 if (!nic_info_addr) 748 if (!nic_info_addr)
758 return -ENOMEM; 749 return -ENOMEM;
759 memset(nic_info_addr, 0, nic_size); 750 memset(nic_info_addr, 0, nic_size);
@@ -804,7 +795,7 @@ int qlcnic_82xx_set_nic_info(struct qlcnic_adapter *adapter,
804 return err; 795 return err;
805 796
806 nic_info_addr = dma_alloc_coherent(&adapter->pdev->dev, nic_size, 797 nic_info_addr = dma_alloc_coherent(&adapter->pdev->dev, nic_size,
807 &nic_dma_t, GFP_KERNEL); 798 &nic_dma_t, GFP_KERNEL);
808 if (!nic_info_addr) 799 if (!nic_info_addr)
809 return -ENOMEM; 800 return -ENOMEM;
810 801
@@ -949,11 +940,10 @@ int qlcnic_get_port_stats(struct qlcnic_adapter *adapter, const u8 func,
949 } 940 }
950 941
951 stats_addr = dma_alloc_coherent(&adapter->pdev->dev, stats_size, 942 stats_addr = dma_alloc_coherent(&adapter->pdev->dev, stats_size,
952 &stats_dma_t, GFP_KERNEL); 943 &stats_dma_t, GFP_KERNEL);
953 if (!stats_addr) { 944 if (!stats_addr)
954 dev_err(&adapter->pdev->dev, "Unable to allocate memory\n");
955 return -ENOMEM; 945 return -ENOMEM;
956 } 946
957 memset(stats_addr, 0, stats_size); 947 memset(stats_addr, 0, stats_size);
958 948
959 arg1 = func | QLCNIC_STATS_VERSION << 8 | QLCNIC_STATS_PORT << 12; 949 arg1 = func | QLCNIC_STATS_VERSION << 8 | QLCNIC_STATS_PORT << 12;
@@ -1003,12 +993,10 @@ int qlcnic_get_mac_stats(struct qlcnic_adapter *adapter,
1003 return -ENOMEM; 993 return -ENOMEM;
1004 994
1005 stats_addr = dma_alloc_coherent(&adapter->pdev->dev, stats_size, 995 stats_addr = dma_alloc_coherent(&adapter->pdev->dev, stats_size,
1006 &stats_dma_t, GFP_KERNEL); 996 &stats_dma_t, GFP_KERNEL);
1007 if (!stats_addr) { 997 if (!stats_addr)
1008 dev_err(&adapter->pdev->dev,
1009 "%s: Unable to allocate memory.\n", __func__);
1010 return -ENOMEM; 998 return -ENOMEM;
1011 } 999
1012 memset(stats_addr, 0, stats_size); 1000 memset(stats_addr, 0, stats_size);
1013 qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_GET_MAC_STATS); 1001 qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_GET_MAC_STATS);
1014 cmd.req.arg[1] = stats_size << 16; 1002 cmd.req.arg[1] = stats_size << 16;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
index abbd22c814a6..4b9bab18ebd9 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
@@ -810,11 +810,8 @@ static int __qlcnic_fw_cmd_get_minidump_temp(struct qlcnic_adapter *adapter,
810 810
811 tmp_addr = dma_alloc_coherent(&adapter->pdev->dev, temp_size, 811 tmp_addr = dma_alloc_coherent(&adapter->pdev->dev, temp_size,
812 &tmp_addr_t, GFP_KERNEL); 812 &tmp_addr_t, GFP_KERNEL);
813 if (!tmp_addr) { 813 if (!tmp_addr)
814 dev_err(&adapter->pdev->dev,
815 "Can't get memory for FW dump template\n");
816 return -ENOMEM; 814 return -ENOMEM;
817 }
818 815
819 if (qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_GET_TEMP_HDR)) { 816 if (qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_GET_TEMP_HDR)) {
820 err = -ENOMEM; 817 err = -ENOMEM;
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 33e96176e4d8..7a6471d87300 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -908,11 +908,8 @@ static int sh_eth_ring_init(struct net_device *ndev)
908 /* Allocate all Rx descriptors. */ 908 /* Allocate all Rx descriptors. */
909 rx_ringsize = sizeof(struct sh_eth_rxdesc) * mdp->num_rx_ring; 909 rx_ringsize = sizeof(struct sh_eth_rxdesc) * mdp->num_rx_ring;
910 mdp->rx_ring = dma_alloc_coherent(NULL, rx_ringsize, &mdp->rx_desc_dma, 910 mdp->rx_ring = dma_alloc_coherent(NULL, rx_ringsize, &mdp->rx_desc_dma,
911 GFP_KERNEL); 911 GFP_KERNEL);
912
913 if (!mdp->rx_ring) { 912 if (!mdp->rx_ring) {
914 dev_err(&ndev->dev, "Cannot allocate Rx Ring (size %d bytes)\n",
915 rx_ringsize);
916 ret = -ENOMEM; 913 ret = -ENOMEM;
917 goto desc_ring_free; 914 goto desc_ring_free;
918 } 915 }
@@ -922,10 +919,8 @@ static int sh_eth_ring_init(struct net_device *ndev)
922 /* Allocate all Tx descriptors. */ 919 /* Allocate all Tx descriptors. */
923 tx_ringsize = sizeof(struct sh_eth_txdesc) * mdp->num_tx_ring; 920 tx_ringsize = sizeof(struct sh_eth_txdesc) * mdp->num_tx_ring;
924 mdp->tx_ring = dma_alloc_coherent(NULL, tx_ringsize, &mdp->tx_desc_dma, 921 mdp->tx_ring = dma_alloc_coherent(NULL, tx_ringsize, &mdp->tx_desc_dma,
925 GFP_KERNEL); 922 GFP_KERNEL);
926 if (!mdp->tx_ring) { 923 if (!mdp->tx_ring) {
927 dev_err(&ndev->dev, "Cannot allocate Tx Ring (size %d bytes)\n",
928 tx_ringsize);
929 ret = -ENOMEM; 924 ret = -ENOMEM;
930 goto desc_ring_free; 925 goto desc_ring_free;
931 } 926 }
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 39c6c5524633..d02b446037d7 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -534,25 +534,17 @@ static void init_dma_desc_rings(struct net_device *dev)
534 GFP_KERNEL); 534 GFP_KERNEL);
535 priv->rx_skbuff = kmalloc_array(rxsize, sizeof(struct sk_buff *), 535 priv->rx_skbuff = kmalloc_array(rxsize, sizeof(struct sk_buff *),
536 GFP_KERNEL); 536 GFP_KERNEL);
537 priv->dma_rx = 537 priv->dma_rx = dma_alloc_coherent(priv->device,
538 (struct dma_desc *)dma_alloc_coherent(priv->device, 538 rxsize * sizeof(struct dma_desc),
539 rxsize * 539 &priv->dma_rx_phy, GFP_KERNEL);
540 sizeof(struct dma_desc),
541 &priv->dma_rx_phy,
542 GFP_KERNEL);
543 priv->tx_skbuff = kmalloc_array(txsize, sizeof(struct sk_buff *), 540 priv->tx_skbuff = kmalloc_array(txsize, sizeof(struct sk_buff *),
544 GFP_KERNEL); 541 GFP_KERNEL);
545 priv->dma_tx = 542 priv->dma_tx = dma_alloc_coherent(priv->device,
546 (struct dma_desc *)dma_alloc_coherent(priv->device, 543 txsize * sizeof(struct dma_desc),
547 txsize * 544 &priv->dma_tx_phy, GFP_KERNEL);
548 sizeof(struct dma_desc), 545
549 &priv->dma_tx_phy, 546 if ((priv->dma_rx == NULL) || (priv->dma_tx == NULL))
550 GFP_KERNEL);
551
552 if ((priv->dma_rx == NULL) || (priv->dma_tx == NULL)) {
553 pr_err("%s:ERROR allocating the DMA Tx/Rx desc\n", __func__);
554 return; 547 return;
555 }
556 548
557 DBG(probe, INFO, "stmmac (%s) DMA desc: virt addr (Rx %p, " 549 DBG(probe, INFO, "stmmac (%s) DMA desc: virt addr (Rx %p, "
558 "Tx %p)\n\tDMA phy addr (Rx 0x%08x, Tx 0x%08x)\n", 550 "Tx %p)\n\tDMA phy addr (Rx 0x%08x, Tx 0x%08x)\n",
diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c
index 5fafca065305..054975939a18 100644
--- a/drivers/net/ethernet/sun/sunbmac.c
+++ b/drivers/net/ethernet/sun/sunbmac.c
@@ -1169,10 +1169,8 @@ static int bigmac_ether_init(struct platform_device *op,
1169 bp->bmac_block = dma_alloc_coherent(&bp->bigmac_op->dev, 1169 bp->bmac_block = dma_alloc_coherent(&bp->bigmac_op->dev,
1170 PAGE_SIZE, 1170 PAGE_SIZE,
1171 &bp->bblock_dvma, GFP_ATOMIC); 1171 &bp->bblock_dvma, GFP_ATOMIC);
1172 if (bp->bmac_block == NULL || bp->bblock_dvma == 0) { 1172 if (bp->bmac_block == NULL || bp->bblock_dvma == 0)
1173 printk(KERN_ERR "BIGMAC: Cannot allocate consistent DMA.\n");
1174 goto fail_and_cleanup; 1173 goto fail_and_cleanup;
1175 }
1176 1174
1177 /* Get the board revision of this BigMAC. */ 1175 /* Get the board revision of this BigMAC. */
1178 bp->board_rev = of_getintprop_default(bp->bigmac_op->dev.of_node, 1176 bp->board_rev = of_getintprop_default(bp->bigmac_op->dev.of_node,
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index a1bff49a8155..436fa9d5a071 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -2752,10 +2752,8 @@ static int happy_meal_sbus_probe_one(struct platform_device *op, int is_qfe)
2752 &hp->hblock_dvma, 2752 &hp->hblock_dvma,
2753 GFP_ATOMIC); 2753 GFP_ATOMIC);
2754 err = -ENOMEM; 2754 err = -ENOMEM;
2755 if (!hp->happy_block) { 2755 if (!hp->happy_block)
2756 printk(KERN_ERR "happymeal: Cannot allocate descriptors.\n");
2757 goto err_out_iounmap; 2756 goto err_out_iounmap;
2758 }
2759 2757
2760 /* Force check of the link first time we are brought up. */ 2758 /* Force check of the link first time we are brought up. */
2761 hp->linkcheck = 0; 2759 hp->linkcheck = 0;
@@ -3068,14 +3066,11 @@ static int happy_meal_pci_probe(struct pci_dev *pdev,
3068 hp->happy_bursts = DMA_BURSTBITS; 3066 hp->happy_bursts = DMA_BURSTBITS;
3069#endif 3067#endif
3070 3068
3071 hp->happy_block = (struct hmeal_init_block *) 3069 hp->happy_block = dma_alloc_coherent(&pdev->dev, PAGE_SIZE,
3072 dma_alloc_coherent(&pdev->dev, PAGE_SIZE, &hp->hblock_dvma, GFP_KERNEL); 3070 &hp->hblock_dvma, GFP_KERNEL);
3073
3074 err = -ENODEV; 3071 err = -ENODEV;
3075 if (!hp->happy_block) { 3072 if (!hp->happy_block)
3076 printk(KERN_ERR "happymeal(PCI): Cannot get hme init block.\n");
3077 goto err_out_iounmap; 3073 goto err_out_iounmap;
3078 }
3079 3074
3080 hp->linkcheck = 0; 3075 hp->linkcheck = 0;
3081 hp->timer_state = asleep; 3076 hp->timer_state = asleep;
diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c
index 8fa947a2d929..99fe3c6eea31 100644
--- a/drivers/net/ethernet/tundra/tsi108_eth.c
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
@@ -1309,22 +1309,16 @@ static int tsi108_open(struct net_device *dev)
1309 } 1309 }
1310 1310
1311 data->rxring = dma_alloc_coherent(NULL, rxring_size, 1311 data->rxring = dma_alloc_coherent(NULL, rxring_size,
1312 &data->rxdma, GFP_KERNEL); 1312 &data->rxdma, GFP_KERNEL);
1313
1314 if (!data->rxring) { 1313 if (!data->rxring) {
1315 printk(KERN_DEBUG
1316 "TSI108_ETH: failed to allocate memory for rxring!\n");
1317 return -ENOMEM; 1314 return -ENOMEM;
1318 } else { 1315 } else {
1319 memset(data->rxring, 0, rxring_size); 1316 memset(data->rxring, 0, rxring_size);
1320 } 1317 }
1321 1318
1322 data->txring = dma_alloc_coherent(NULL, txring_size, 1319 data->txring = dma_alloc_coherent(NULL, txring_size,
1323 &data->txdma, GFP_KERNEL); 1320 &data->txdma, GFP_KERNEL);
1324
1325 if (!data->txring) { 1321 if (!data->txring) {
1326 printk(KERN_DEBUG
1327 "TSI108_ETH: failed to allocate memory for txring!\n");
1328 pci_free_consistent(0, rxring_size, data->rxring, data->rxdma); 1322 pci_free_consistent(0, rxring_size, data->rxring, data->rxdma);
1329 return -ENOMEM; 1323 return -ENOMEM;
1330 } else { 1324 } else {
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 5ac43e4ace25..a64a6d74a5c8 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -246,19 +246,14 @@ static int temac_dma_bd_init(struct net_device *ndev)
246 lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent, 246 lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent,
247 sizeof(*lp->tx_bd_v) * TX_BD_NUM, 247 sizeof(*lp->tx_bd_v) * TX_BD_NUM,
248 &lp->tx_bd_p, GFP_KERNEL); 248 &lp->tx_bd_p, GFP_KERNEL);
249 if (!lp->tx_bd_v) { 249 if (!lp->tx_bd_v)
250 dev_err(&ndev->dev,
251 "unable to allocate DMA TX buffer descriptors");
252 goto out; 250 goto out;
253 } 251
254 lp->rx_bd_v = dma_alloc_coherent(ndev->dev.parent, 252 lp->rx_bd_v = dma_alloc_coherent(ndev->dev.parent,
255 sizeof(*lp->rx_bd_v) * RX_BD_NUM, 253 sizeof(*lp->rx_bd_v) * RX_BD_NUM,
256 &lp->rx_bd_p, GFP_KERNEL); 254 &lp->rx_bd_p, GFP_KERNEL);
257 if (!lp->rx_bd_v) { 255 if (!lp->rx_bd_v)
258 dev_err(&ndev->dev,
259 "unable to allocate DMA RX buffer descriptors");
260 goto out; 256 goto out;
261 }
262 257
263 memset(lp->tx_bd_v, 0, sizeof(*lp->tx_bd_v) * TX_BD_NUM); 258 memset(lp->tx_bd_v, 0, sizeof(*lp->tx_bd_v) * TX_BD_NUM);
264 for (i = 0; i < TX_BD_NUM; i++) { 259 for (i = 0; i < TX_BD_NUM; i++) {
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 397d4a6a1f30..c238f980e28e 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -205,21 +205,15 @@ static int axienet_dma_bd_init(struct net_device *ndev)
205 sizeof(*lp->tx_bd_v) * TX_BD_NUM, 205 sizeof(*lp->tx_bd_v) * TX_BD_NUM,
206 &lp->tx_bd_p, 206 &lp->tx_bd_p,
207 GFP_KERNEL); 207 GFP_KERNEL);
208 if (!lp->tx_bd_v) { 208 if (!lp->tx_bd_v)
209 dev_err(&ndev->dev, "unable to allocate DMA Tx buffer "
210 "descriptors");
211 goto out; 209 goto out;
212 }
213 210
214 lp->rx_bd_v = dma_alloc_coherent(ndev->dev.parent, 211 lp->rx_bd_v = dma_alloc_coherent(ndev->dev.parent,
215 sizeof(*lp->rx_bd_v) * RX_BD_NUM, 212 sizeof(*lp->rx_bd_v) * RX_BD_NUM,
216 &lp->rx_bd_p, 213 &lp->rx_bd_p,
217 GFP_KERNEL); 214 GFP_KERNEL);
218 if (!lp->rx_bd_v) { 215 if (!lp->rx_bd_v)
219 dev_err(&ndev->dev, "unable to allocate DMA Rx buffer "
220 "descriptors");
221 goto out; 216 goto out;
222 }
223 217
224 memset(lp->tx_bd_v, 0, sizeof(*lp->tx_bd_v) * TX_BD_NUM); 218 memset(lp->tx_bd_v, 0, sizeof(*lp->tx_bd_v) * TX_BD_NUM);
225 for (i = 0; i < TX_BD_NUM; i++) { 219 for (i = 0; i < TX_BD_NUM; i++) {
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
index 502c8ff1d985..f116e51e3865 100644
--- a/drivers/net/fddi/defxx.c
+++ b/drivers/net/fddi/defxx.c
@@ -1071,11 +1071,9 @@ static int dfx_driver_init(struct net_device *dev, const char *print_name,
1071 bp->kmalloced = top_v = dma_alloc_coherent(bp->bus_dev, alloc_size, 1071 bp->kmalloced = top_v = dma_alloc_coherent(bp->bus_dev, alloc_size,
1072 &bp->kmalloced_dma, 1072 &bp->kmalloced_dma,
1073 GFP_ATOMIC); 1073 GFP_ATOMIC);
1074 if (top_v == NULL) { 1074 if (top_v == NULL)
1075 printk("%s: Could not allocate memory for host buffers "
1076 "and structures!\n", print_name);
1077 return DFX_K_FAILURE; 1075 return DFX_K_FAILURE;
1078 } 1076
1079 memset(top_v, 0, alloc_size); /* zero out memory before continuing */ 1077 memset(top_v, 0, alloc_size); /* zero out memory before continuing */
1080 top_p = bp->kmalloced_dma; /* get physical address of buffer */ 1078 top_p = bp->kmalloced_dma; /* get physical address of buffer */
1081 1079
diff --git a/drivers/net/irda/bfin_sir.c b/drivers/net/irda/bfin_sir.c
index fed4a05d55c7..a06fca61c9a0 100644
--- a/drivers/net/irda/bfin_sir.c
+++ b/drivers/net/irda/bfin_sir.c
@@ -389,7 +389,8 @@ static int bfin_sir_startup(struct bfin_sir_port *port, struct net_device *dev)
389 set_dma_callback(port->rx_dma_channel, bfin_sir_dma_rx_int, dev); 389 set_dma_callback(port->rx_dma_channel, bfin_sir_dma_rx_int, dev);
390 set_dma_callback(port->tx_dma_channel, bfin_sir_dma_tx_int, dev); 390 set_dma_callback(port->tx_dma_channel, bfin_sir_dma_tx_int, dev);
391 391
392 port->rx_dma_buf.buf = (unsigned char *)dma_alloc_coherent(NULL, PAGE_SIZE, &dma_handle, GFP_DMA); 392 port->rx_dma_buf.buf = dma_alloc_coherent(NULL, PAGE_SIZE,
393 &dma_handle, GFP_DMA);
393 port->rx_dma_buf.head = 0; 394 port->rx_dma_buf.head = 0;
394 port->rx_dma_buf.tail = 0; 395 port->rx_dma_buf.tail = 0;
395 port->rx_dma_nrows = 0; 396 port->rx_dma_nrows = 0;
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 5290952b60c2..59b45c10adbc 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -564,20 +564,14 @@ static int smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u8 dma,
564 self->rx_buff.head = 564 self->rx_buff.head =
565 dma_alloc_coherent(NULL, self->rx_buff.truesize, 565 dma_alloc_coherent(NULL, self->rx_buff.truesize,
566 &self->rx_buff_dma, GFP_KERNEL); 566 &self->rx_buff_dma, GFP_KERNEL);
567 if (self->rx_buff.head == NULL) { 567 if (self->rx_buff.head == NULL)
568 IRDA_ERROR("%s, Can't allocate memory for receive buffer!\n",
569 driver_name);
570 goto err_out2; 568 goto err_out2;
571 }
572 569
573 self->tx_buff.head = 570 self->tx_buff.head =
574 dma_alloc_coherent(NULL, self->tx_buff.truesize, 571 dma_alloc_coherent(NULL, self->tx_buff.truesize,
575 &self->tx_buff_dma, GFP_KERNEL); 572 &self->tx_buff_dma, GFP_KERNEL);
576 if (self->tx_buff.head == NULL) { 573 if (self->tx_buff.head == NULL)
577 IRDA_ERROR("%s, Can't allocate memory for transmit buffer!\n",
578 driver_name);
579 goto err_out3; 574 goto err_out3;
580 }
581 575
582 memset(self->rx_buff.head, 0, self->rx_buff.truesize); 576 memset(self->rx_buff.head, 0, self->rx_buff.truesize);
583 memset(self->tx_buff.head, 0, self->tx_buff.truesize); 577 memset(self->tx_buff.head, 0, self->tx_buff.truesize);
diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c
index d1315b442375..55dd95f9824f 100644
--- a/drivers/net/wireless/ath/wil6210/txrx.c
+++ b/drivers/net/wireless/ath/wil6210/txrx.c
@@ -83,8 +83,6 @@ static int wil_vring_alloc(struct wil6210_priv *wil, struct vring *vring)
83 */ 83 */
84 vring->va = dma_alloc_coherent(dev, sz, &vring->pa, GFP_KERNEL); 84 vring->va = dma_alloc_coherent(dev, sz, &vring->pa, GFP_KERNEL);
85 if (!vring->va) { 85 if (!vring->va) {
86 wil_err(wil, "vring_alloc [%d] failed to alloc DMA mem\n",
87 vring->size);
88 kfree(vring->ctx); 86 kfree(vring->ctx);
89 vring->ctx = NULL; 87 vring->ctx = NULL;
90 return -ENOMEM; 88 return -ENOMEM;
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
index 2d3c6644f82d..07d7e928eac7 100644
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@ -335,11 +335,8 @@ static int alloc_ringmemory(struct b43legacy_dmaring *ring)
335 B43legacy_DMA_RINGMEMSIZE, 335 B43legacy_DMA_RINGMEMSIZE,
336 &(ring->dmabase), 336 &(ring->dmabase),
337 GFP_KERNEL); 337 GFP_KERNEL);
338 if (!ring->descbase) { 338 if (!ring->descbase)
339 b43legacyerr(ring->dev->wl, "DMA ringmemory allocation"
340 " failed\n");
341 return -ENOMEM; 339 return -ENOMEM;
342 }
343 memset(ring->descbase, 0, B43legacy_DMA_RINGMEMSIZE); 340 memset(ring->descbase, 0, B43legacy_DMA_RINGMEMSIZE);
344 341
345 return 0; 342 return 0;
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c
index e0b9d7fa5de0..dc1e6da9976a 100644
--- a/drivers/net/wireless/iwlegacy/3945.c
+++ b/drivers/net/wireless/iwlegacy/3945.c
@@ -2379,10 +2379,8 @@ il3945_hw_set_hw_params(struct il_priv *il)
2379 il->_3945.shared_virt = 2379 il->_3945.shared_virt =
2380 dma_alloc_coherent(&il->pci_dev->dev, sizeof(struct il3945_shared), 2380 dma_alloc_coherent(&il->pci_dev->dev, sizeof(struct il3945_shared),
2381 &il->_3945.shared_phys, GFP_KERNEL); 2381 &il->_3945.shared_phys, GFP_KERNEL);
2382 if (!il->_3945.shared_virt) { 2382 if (!il->_3945.shared_virt)
2383 IL_ERR("failed to allocate pci memory\n");
2384 return -ENOMEM; 2383 return -ENOMEM;
2385 }
2386 2384
2387 il->hw_params.bcast_id = IL3945_BROADCAST_ID; 2385 il->hw_params.bcast_id = IL3945_BROADCAST_ID;
2388 2386
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index e006ea831320..bd4c18804709 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -2941,10 +2941,9 @@ il_tx_queue_alloc(struct il_priv *il, struct il_tx_queue *txq, u32 id)
2941 * shared with device */ 2941 * shared with device */
2942 txq->tfds = 2942 txq->tfds =
2943 dma_alloc_coherent(dev, tfd_sz, &txq->q.dma_addr, GFP_KERNEL); 2943 dma_alloc_coherent(dev, tfd_sz, &txq->q.dma_addr, GFP_KERNEL);
2944 if (!txq->tfds) { 2944 if (!txq->tfds)
2945 IL_ERR("Fail to alloc TFDs\n");
2946 goto error; 2945 goto error;
2947 } 2946
2948 txq->q.id = id; 2947 txq->q.id = id;
2949 2948
2950 return 0; 2949 return 0;
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index 8595c16f74de..7a508d835f5a 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -501,10 +501,8 @@ static int iwl_pcie_txq_alloc(struct iwl_trans *trans,
501 * shared with device */ 501 * shared with device */
502 txq->tfds = dma_alloc_coherent(trans->dev, tfd_sz, 502 txq->tfds = dma_alloc_coherent(trans->dev, tfd_sz,
503 &txq->q.dma_addr, GFP_KERNEL); 503 &txq->q.dma_addr, GFP_KERNEL);
504 if (!txq->tfds) { 504 if (!txq->tfds)
505 IWL_ERR(trans, "dma_alloc_coherent(%zd) failed\n", tfd_sz);
506 goto error; 505 goto error;
507 }
508 506
509 BUILD_BUG_ON(IWL_HCMD_SCRATCHBUF_SIZE != sizeof(*txq->scratchbufs)); 507 BUILD_BUG_ON(IWL_HCMD_SCRATCHBUF_SIZE != sizeof(*txq->scratchbufs));
510 BUILD_BUG_ON(offsetof(struct iwl_pcie_txq_scratch_buf, scratch) != 508 BUILD_BUG_ON(offsetof(struct iwl_pcie_txq_scratch_buf, scratch) !=