aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-08-27 01:45:23 -0400
committerDavid S. Miller <davem@davemloft.net>2013-08-29 21:55:23 -0400
commitede23fa8161c1a04aa1b3bf5447812ca14b3fef1 (patch)
tree783051ba0b2e2c7e4b9f8c5bca53282cb2ad314e /drivers/net
parentafe4fd062416b158a8a8538b23adc1930a9b88dc (diff)
drivers:net: Convert dma_alloc_coherent(...__GFP_ZERO) to dma_zalloc_coherent
__GFP_ZERO is an uncommon flag and perhaps is better not used. static inline dma_zalloc_coherent exists so convert the uses of dma_alloc_coherent with __GFP_ZERO to the more common kernel style with zalloc. Remove memset from the static inline dma_zalloc_coherent and add just one use of __GFP_ZERO instead. Trivially reduces the size of the existing uses of dma_zalloc_coherent. Realign arguments as appropriate. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/aeroflex/greth.c12
-rw-r--r--drivers/net/ethernet/broadcom/bcm63xx_enet.c6
-rw-r--r--drivers/net/ethernet/broadcom/bnx2.c5
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x.h5
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h3
-rw-r--r--drivers/net/ethernet/broadcom/tg3.c23
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c18
-rw-r--r--drivers/net/ethernet/faraday/ftgmac100.c7
-rw-r--r--drivers/net/ethernet/faraday/ftmac100.c8
-rw-r--r--drivers/net/ethernet/ibm/emac/mal.c4
-rw-r--r--drivers/net/ethernet/intel/e1000/e1000_ethtool.c8
-rw-r--r--drivers/net/ethernet/intel/ixgb/ixgb_main.c4
-rw-r--r--drivers/net/ethernet/marvell/pxa168_eth.c19
-rw-r--r--drivers/net/ethernet/myricom/myri10ge/myri10ge.c6
-rw-r--r--drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c16
-rw-r--r--drivers/net/ethernet/pasemi/pasemi_mac.c7
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c29
-rw-r--r--drivers/net/ethernet/sfc/nic.c5
-rw-r--r--drivers/net/ethernet/sgi/meth.c5
-rw-r--r--drivers/net/ethernet/tundra/tsi108_eth.c8
-rw-r--r--drivers/net/ethernet/xilinx/ll_temac_main.c12
-rw-r--r--drivers/net/ethernet/xilinx/xilinx_axienet_main.c14
-rw-r--r--drivers/net/fddi/defxx.c6
-rw-r--r--drivers/net/irda/ali-ircc.c8
-rw-r--r--drivers/net/irda/nsc-ircc.c8
-rw-r--r--drivers/net/irda/smsc-ircc2.c8
-rw-r--r--drivers/net/irda/via-ircc.c8
-rw-r--r--drivers/net/irda/w83977af_ir.c8
-rw-r--r--drivers/net/wireless/b43/dma.c6
-rw-r--r--drivers/net/wireless/b43legacy/dma.c7
30 files changed, 133 insertions, 150 deletions
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
index 7ff4b30d55ea..e06694555144 100644
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -1464,18 +1464,18 @@ 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 = dma_alloc_coherent(greth->dev, 1024, 1467 greth->tx_bd_base = dma_zalloc_coherent(greth->dev, 1024,
1468 &greth->tx_bd_base_phys, 1468 &greth->tx_bd_base_phys,
1469 GFP_KERNEL | __GFP_ZERO); 1469 GFP_KERNEL);
1470 if (!greth->tx_bd_base) { 1470 if (!greth->tx_bd_base) {
1471 err = -ENOMEM; 1471 err = -ENOMEM;
1472 goto error3; 1472 goto error3;
1473 } 1473 }
1474 1474
1475 /* Allocate RX descriptor ring in coherent memory */ 1475 /* Allocate RX descriptor ring in coherent memory */
1476 greth->rx_bd_base = dma_alloc_coherent(greth->dev, 1024, 1476 greth->rx_bd_base = dma_zalloc_coherent(greth->dev, 1024,
1477 &greth->rx_bd_base_phys, 1477 &greth->rx_bd_base_phys,
1478 GFP_KERNEL | __GFP_ZERO); 1478 GFP_KERNEL);
1479 if (!greth->rx_bd_base) { 1479 if (!greth->rx_bd_base) {
1480 err = -ENOMEM; 1480 err = -ENOMEM;
1481 goto error4; 1481 goto error4;
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 190219e02400..98b68703c53d 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -948,8 +948,7 @@ static int bcm_enet_open(struct net_device *dev)
948 948
949 /* allocate rx dma ring */ 949 /* allocate rx dma ring */
950 size = priv->rx_ring_size * sizeof(struct bcm_enet_desc); 950 size = priv->rx_ring_size * sizeof(struct bcm_enet_desc);
951 p = dma_alloc_coherent(kdev, size, &priv->rx_desc_dma, 951 p = dma_zalloc_coherent(kdev, size, &priv->rx_desc_dma, GFP_KERNEL);
952 GFP_KERNEL | __GFP_ZERO);
953 if (!p) { 952 if (!p) {
954 ret = -ENOMEM; 953 ret = -ENOMEM;
955 goto out_freeirq_tx; 954 goto out_freeirq_tx;
@@ -960,8 +959,7 @@ static int bcm_enet_open(struct net_device *dev)
960 959
961 /* allocate tx dma ring */ 960 /* allocate tx dma ring */
962 size = priv->tx_ring_size * sizeof(struct bcm_enet_desc); 961 size = priv->tx_ring_size * sizeof(struct bcm_enet_desc);
963 p = dma_alloc_coherent(kdev, size, &priv->tx_desc_dma, 962 p = dma_zalloc_coherent(kdev, size, &priv->tx_desc_dma, GFP_KERNEL);
964 GFP_KERNEL | __GFP_ZERO);
965 if (!p) { 963 if (!p) {
966 ret = -ENOMEM; 964 ret = -ENOMEM;
967 goto out_free_rx_ring; 965 goto out_free_rx_ring;
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 4148058cef81..e838a3f74b69 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -853,9 +853,8 @@ bnx2_alloc_mem(struct bnx2 *bp)
853 bp->status_stats_size = status_blk_size + 853 bp->status_stats_size = status_blk_size +
854 sizeof(struct statistics_block); 854 sizeof(struct statistics_block);
855 855
856 status_blk = dma_alloc_coherent(&bp->pdev->dev, bp->status_stats_size, 856 status_blk = dma_zalloc_coherent(&bp->pdev->dev, bp->status_stats_size,
857 &bp->status_blk_mapping, 857 &bp->status_blk_mapping, GFP_KERNEL);
858 GFP_KERNEL | __GFP_ZERO);
859 if (status_blk == NULL) 858 if (status_blk == NULL)
860 goto alloc_mem_err; 859 goto alloc_mem_err;
861 860
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 12202f81735c..3e77a1b1a44a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -2069,9 +2069,8 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
2069void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id, 2069void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id,
2070 bool is_pf); 2070 bool is_pf);
2071 2071
2072#define BNX2X_ILT_ZALLOC(x, y, size) \ 2072#define BNX2X_ILT_ZALLOC(x, y, size) \
2073 x = dma_alloc_coherent(&bp->pdev->dev, size, y, \ 2073 x = dma_zalloc_coherent(&bp->pdev->dev, size, y, GFP_KERNEL)
2074 GFP_KERNEL | __GFP_ZERO)
2075 2074
2076#define BNX2X_ILT_FREE(x, y, size) \ 2075#define BNX2X_ILT_FREE(x, y, size) \
2077 do { \ 2076 do { \
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
index 38be494ffa6e..affb7646241e 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
@@ -51,8 +51,7 @@ extern int int_mode;
51 51
52#define BNX2X_PCI_ALLOC(x, y, size) \ 52#define BNX2X_PCI_ALLOC(x, y, size) \
53 do { \ 53 do { \
54 x = dma_alloc_coherent(&bp->pdev->dev, size, y, \ 54 x = dma_zalloc_coherent(&bp->pdev->dev, size, y, GFP_KERNEL); \
55 GFP_KERNEL | __GFP_ZERO); \
56 if (x == NULL) \ 55 if (x == NULL) \
57 goto alloc_mem_err; \ 56 goto alloc_mem_err; \
58 DP(NETIF_MSG_HW, "BNX2X_PCI_ALLOC: Physical %Lx Virtual %p\n", \ 57 DP(NETIF_MSG_HW, "BNX2X_PCI_ALLOC: Physical %Lx Virtual %p\n", \
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 95b8995187d7..2e55ee29cf13 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -8591,10 +8591,10 @@ static int tg3_mem_rx_acquire(struct tg3 *tp)
8591 if (!i && tg3_flag(tp, ENABLE_RSS)) 8591 if (!i && tg3_flag(tp, ENABLE_RSS))
8592 continue; 8592 continue;
8593 8593
8594 tnapi->rx_rcb = dma_alloc_coherent(&tp->pdev->dev, 8594 tnapi->rx_rcb = dma_zalloc_coherent(&tp->pdev->dev,
8595 TG3_RX_RCB_RING_BYTES(tp), 8595 TG3_RX_RCB_RING_BYTES(tp),
8596 &tnapi->rx_rcb_mapping, 8596 &tnapi->rx_rcb_mapping,
8597 GFP_KERNEL | __GFP_ZERO); 8597 GFP_KERNEL);
8598 if (!tnapi->rx_rcb) 8598 if (!tnapi->rx_rcb)
8599 goto err_out; 8599 goto err_out;
8600 } 8600 }
@@ -8643,10 +8643,9 @@ static int tg3_alloc_consistent(struct tg3 *tp)
8643{ 8643{
8644 int i; 8644 int i;
8645 8645
8646 tp->hw_stats = dma_alloc_coherent(&tp->pdev->dev, 8646 tp->hw_stats = dma_zalloc_coherent(&tp->pdev->dev,
8647 sizeof(struct tg3_hw_stats), 8647 sizeof(struct tg3_hw_stats),
8648 &tp->stats_mapping, 8648 &tp->stats_mapping, GFP_KERNEL);
8649 GFP_KERNEL | __GFP_ZERO);
8650 if (!tp->hw_stats) 8649 if (!tp->hw_stats)
8651 goto err_out; 8650 goto err_out;
8652 8651
@@ -8654,10 +8653,10 @@ static int tg3_alloc_consistent(struct tg3 *tp)
8654 struct tg3_napi *tnapi = &tp->napi[i]; 8653 struct tg3_napi *tnapi = &tp->napi[i];
8655 struct tg3_hw_status *sblk; 8654 struct tg3_hw_status *sblk;
8656 8655
8657 tnapi->hw_status = dma_alloc_coherent(&tp->pdev->dev, 8656 tnapi->hw_status = dma_zalloc_coherent(&tp->pdev->dev,
8658 TG3_HW_STATUS_SIZE, 8657 TG3_HW_STATUS_SIZE,
8659 &tnapi->status_mapping, 8658 &tnapi->status_mapping,
8660 GFP_KERNEL | __GFP_ZERO); 8659 GFP_KERNEL);
8661 if (!tnapi->hw_status) 8660 if (!tnapi->hw_status)
8662 goto err_out; 8661 goto err_out;
8663 8662
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 50116f8ed576..39e0a7697a81 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -145,8 +145,8 @@ static int be_queue_alloc(struct be_adapter *adapter, struct be_queue_info *q,
145 q->len = len; 145 q->len = len;
146 q->entry_size = entry_size; 146 q->entry_size = entry_size;
147 mem->size = len * entry_size; 147 mem->size = len * entry_size;
148 mem->va = dma_alloc_coherent(&adapter->pdev->dev, mem->size, &mem->dma, 148 mem->va = dma_zalloc_coherent(&adapter->pdev->dev, mem->size, &mem->dma,
149 GFP_KERNEL | __GFP_ZERO); 149 GFP_KERNEL);
150 if (!mem->va) 150 if (!mem->va)
151 return -ENOMEM; 151 return -ENOMEM;
152 return 0; 152 return 0;
@@ -2642,8 +2642,8 @@ static int be_setup_wol(struct be_adapter *adapter, bool enable)
2642 memset(mac, 0, ETH_ALEN); 2642 memset(mac, 0, ETH_ALEN);
2643 2643
2644 cmd.size = sizeof(struct be_cmd_req_acpi_wol_magic_config); 2644 cmd.size = sizeof(struct be_cmd_req_acpi_wol_magic_config);
2645 cmd.va = dma_alloc_coherent(&adapter->pdev->dev, cmd.size, &cmd.dma, 2645 cmd.va = dma_zalloc_coherent(&adapter->pdev->dev, cmd.size, &cmd.dma,
2646 GFP_KERNEL | __GFP_ZERO); 2646 GFP_KERNEL);
2647 if (cmd.va == NULL) 2647 if (cmd.va == NULL)
2648 return -1; 2648 return -1;
2649 2649
@@ -3946,9 +3946,9 @@ static int be_ctrl_init(struct be_adapter *adapter)
3946 memset(mbox_mem_align->va, 0, sizeof(struct be_mcc_mailbox)); 3946 memset(mbox_mem_align->va, 0, sizeof(struct be_mcc_mailbox));
3947 3947
3948 rx_filter->size = sizeof(struct be_cmd_req_rx_filter); 3948 rx_filter->size = sizeof(struct be_cmd_req_rx_filter);
3949 rx_filter->va = dma_alloc_coherent(&adapter->pdev->dev, rx_filter->size, 3949 rx_filter->va = dma_zalloc_coherent(&adapter->pdev->dev,
3950 &rx_filter->dma, 3950 rx_filter->size, &rx_filter->dma,
3951 GFP_KERNEL | __GFP_ZERO); 3951 GFP_KERNEL);
3952 if (rx_filter->va == NULL) { 3952 if (rx_filter->va == NULL) {
3953 status = -ENOMEM; 3953 status = -ENOMEM;
3954 goto free_mbox; 3954 goto free_mbox;
@@ -3994,8 +3994,8 @@ static int be_stats_init(struct be_adapter *adapter)
3994 /* BE3 and Skyhawk */ 3994 /* BE3 and Skyhawk */
3995 cmd->size = sizeof(struct be_cmd_req_get_stats_v1); 3995 cmd->size = sizeof(struct be_cmd_req_get_stats_v1);
3996 3996
3997 cmd->va = dma_alloc_coherent(&adapter->pdev->dev, cmd->size, &cmd->dma, 3997 cmd->va = dma_zalloc_coherent(&adapter->pdev->dev, cmd->size, &cmd->dma,
3998 GFP_KERNEL | __GFP_ZERO); 3998 GFP_KERNEL);
3999 if (cmd->va == NULL) 3999 if (cmd->va == NULL)
4000 return -1; 4000 return -1;
4001 return 0; 4001 return 0;
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 934e1ae279f0..212f44b3a773 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -778,10 +778,9 @@ static int ftgmac100_alloc_buffers(struct ftgmac100 *priv)
778{ 778{
779 int i; 779 int i;
780 780
781 priv->descs = dma_alloc_coherent(priv->dev, 781 priv->descs = dma_zalloc_coherent(priv->dev,
782 sizeof(struct ftgmac100_descs), 782 sizeof(struct ftgmac100_descs),
783 &priv->descs_dma_addr, 783 &priv->descs_dma_addr, GFP_KERNEL);
784 GFP_KERNEL | __GFP_ZERO);
785 if (!priv->descs) 784 if (!priv->descs)
786 return -ENOMEM; 785 return -ENOMEM;
787 786
diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
index 4658f4cc1969..8be5b40c0a12 100644
--- a/drivers/net/ethernet/faraday/ftmac100.c
+++ b/drivers/net/ethernet/faraday/ftmac100.c
@@ -732,10 +732,10 @@ static int ftmac100_alloc_buffers(struct ftmac100 *priv)
732{ 732{
733 int i; 733 int i;
734 734
735 priv->descs = dma_alloc_coherent(priv->dev, 735 priv->descs = dma_zalloc_coherent(priv->dev,
736 sizeof(struct ftmac100_descs), 736 sizeof(struct ftmac100_descs),
737 &priv->descs_dma_addr, 737 &priv->descs_dma_addr,
738 GFP_KERNEL | __GFP_ZERO); 738 GFP_KERNEL);
739 if (!priv->descs) 739 if (!priv->descs)
740 return -ENOMEM; 740 return -ENOMEM;
741 741
diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c
index 856ea66c9223..dac564c25440 100644
--- a/drivers/net/ethernet/ibm/emac/mal.c
+++ b/drivers/net/ethernet/ibm/emac/mal.c
@@ -637,8 +637,8 @@ 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 = dma_alloc_coherent(&ofdev->dev, bd_size, &mal->bd_dma, 640 mal->bd_virt = dma_zalloc_coherent(&ofdev->dev, bd_size, &mal->bd_dma,
641 GFP_KERNEL | __GFP_ZERO); 641 GFP_KERNEL);
642 if (mal->bd_virt == NULL) { 642 if (mal->bd_virt == NULL) {
643 err = -ENOMEM; 643 err = -ENOMEM;
644 goto fail_unmap; 644 goto fail_unmap;
diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
index 82a967c95598..73a8aeefb92a 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
@@ -1019,8 +1019,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
1019 1019
1020 txdr->size = txdr->count * sizeof(struct e1000_tx_desc); 1020 txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
1021 txdr->size = ALIGN(txdr->size, 4096); 1021 txdr->size = ALIGN(txdr->size, 4096);
1022 txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma, 1022 txdr->desc = dma_zalloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
1023 GFP_KERNEL | __GFP_ZERO); 1023 GFP_KERNEL);
1024 if (!txdr->desc) { 1024 if (!txdr->desc) {
1025 ret_val = 2; 1025 ret_val = 2;
1026 goto err_nomem; 1026 goto err_nomem;
@@ -1077,8 +1077,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
1077 } 1077 }
1078 1078
1079 rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc); 1079 rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc);
1080 rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma, 1080 rxdr->desc = dma_zalloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
1081 GFP_KERNEL | __GFP_ZERO); 1081 GFP_KERNEL);
1082 if (!rxdr->desc) { 1082 if (!rxdr->desc) {
1083 ret_val = 6; 1083 ret_val = 6;
1084 goto err_nomem; 1084 goto err_nomem;
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index fce3e92f9d11..9f6b236828e6 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -718,8 +718,8 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter)
718 txdr->size = txdr->count * sizeof(struct ixgb_tx_desc); 718 txdr->size = txdr->count * sizeof(struct ixgb_tx_desc);
719 txdr->size = ALIGN(txdr->size, 4096); 719 txdr->size = ALIGN(txdr->size, 4096);
720 720
721 txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma, 721 txdr->desc = dma_zalloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
722 GFP_KERNEL | __GFP_ZERO); 722 GFP_KERNEL);
723 if (!txdr->desc) { 723 if (!txdr->desc) {
724 vfree(txdr->buffer_info); 724 vfree(txdr->buffer_info);
725 return -ENOMEM; 725 return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index db481477bcc5..3e69febe377e 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -583,10 +583,9 @@ static int init_hash_table(struct pxa168_eth_private *pep)
583 * table is full. 583 * table is full.
584 */ 584 */
585 if (pep->htpr == NULL) { 585 if (pep->htpr == NULL) {
586 pep->htpr = dma_alloc_coherent(pep->dev->dev.parent, 586 pep->htpr = dma_zalloc_coherent(pep->dev->dev.parent,
587 HASH_ADDR_TABLE_SIZE, 587 HASH_ADDR_TABLE_SIZE,
588 &pep->htpr_dma, 588 &pep->htpr_dma, GFP_KERNEL);
589 GFP_KERNEL | __GFP_ZERO);
590 if (pep->htpr == NULL) 589 if (pep->htpr == NULL)
591 return -ENOMEM; 590 return -ENOMEM;
592 } else { 591 } else {
@@ -1024,9 +1023,9 @@ static int rxq_init(struct net_device *dev)
1024 pep->rx_desc_count = 0; 1023 pep->rx_desc_count = 0;
1025 size = pep->rx_ring_size * sizeof(struct rx_desc); 1024 size = pep->rx_ring_size * sizeof(struct rx_desc);
1026 pep->rx_desc_area_size = size; 1025 pep->rx_desc_area_size = size;
1027 pep->p_rx_desc_area = dma_alloc_coherent(pep->dev->dev.parent, size, 1026 pep->p_rx_desc_area = dma_zalloc_coherent(pep->dev->dev.parent, size,
1028 &pep->rx_desc_dma, 1027 &pep->rx_desc_dma,
1029 GFP_KERNEL | __GFP_ZERO); 1028 GFP_KERNEL);
1030 if (!pep->p_rx_desc_area) 1029 if (!pep->p_rx_desc_area)
1031 goto out; 1030 goto out;
1032 1031
@@ -1085,9 +1084,9 @@ static int txq_init(struct net_device *dev)
1085 pep->tx_desc_count = 0; 1084 pep->tx_desc_count = 0;
1086 size = pep->tx_ring_size * sizeof(struct tx_desc); 1085 size = pep->tx_ring_size * sizeof(struct tx_desc);
1087 pep->tx_desc_area_size = size; 1086 pep->tx_desc_area_size = size;
1088 pep->p_tx_desc_area = dma_alloc_coherent(pep->dev->dev.parent, size, 1087 pep->p_tx_desc_area = dma_zalloc_coherent(pep->dev->dev.parent, size,
1089 &pep->tx_desc_dma, 1088 &pep->tx_desc_dma,
1090 GFP_KERNEL | __GFP_ZERO); 1089 GFP_KERNEL);
1091 if (!pep->p_tx_desc_area) 1090 if (!pep->p_tx_desc_area)
1092 goto out; 1091 goto out;
1093 /* Initialize the next_desc_ptr links in the Tx descriptors ring */ 1092 /* Initialize the next_desc_ptr links in the Tx descriptors ring */
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index 50a1d4a04eb0..149355b52ad0 100644
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
@@ -3783,9 +3783,9 @@ static int myri10ge_alloc_slices(struct myri10ge_priv *mgp)
3783 for (i = 0; i < mgp->num_slices; i++) { 3783 for (i = 0; i < mgp->num_slices; i++) {
3784 ss = &mgp->ss[i]; 3784 ss = &mgp->ss[i];
3785 bytes = mgp->max_intr_slots * sizeof(*ss->rx_done.entry); 3785 bytes = mgp->max_intr_slots * sizeof(*ss->rx_done.entry);
3786 ss->rx_done.entry = dma_alloc_coherent(&pdev->dev, bytes, 3786 ss->rx_done.entry = dma_zalloc_coherent(&pdev->dev, bytes,
3787 &ss->rx_done.bus, 3787 &ss->rx_done.bus,
3788 GFP_KERNEL | __GFP_ZERO); 3788 GFP_KERNEL);
3789 if (ss->rx_done.entry == NULL) 3789 if (ss->rx_done.entry == NULL)
3790 goto abort; 3790 goto abort;
3791 bytes = sizeof(*ss->fw_stats); 3791 bytes = sizeof(*ss->fw_stats);
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 e19f1be60d5e..5a0f04c2c813 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
@@ -1491,9 +1491,9 @@ pch_gbe_alloc_rx_buffers_pool(struct pch_gbe_adapter *adapter,
1491 bufsz = adapter->rx_buffer_len; 1491 bufsz = adapter->rx_buffer_len;
1492 1492
1493 size = rx_ring->count * bufsz + PCH_GBE_RESERVE_MEMORY; 1493 size = rx_ring->count * bufsz + PCH_GBE_RESERVE_MEMORY;
1494 rx_ring->rx_buff_pool = dma_alloc_coherent(&pdev->dev, size, 1494 rx_ring->rx_buff_pool =
1495 &rx_ring->rx_buff_pool_logic, 1495 dma_zalloc_coherent(&pdev->dev, size,
1496 GFP_KERNEL | __GFP_ZERO); 1496 &rx_ring->rx_buff_pool_logic, GFP_KERNEL);
1497 if (!rx_ring->rx_buff_pool) 1497 if (!rx_ring->rx_buff_pool)
1498 return -ENOMEM; 1498 return -ENOMEM;
1499 1499
@@ -1807,9 +1807,8 @@ int pch_gbe_setup_tx_resources(struct pch_gbe_adapter *adapter,
1807 1807
1808 tx_ring->size = tx_ring->count * (int)sizeof(struct pch_gbe_tx_desc); 1808 tx_ring->size = tx_ring->count * (int)sizeof(struct pch_gbe_tx_desc);
1809 1809
1810 tx_ring->desc = dma_alloc_coherent(&pdev->dev, tx_ring->size, 1810 tx_ring->desc = dma_zalloc_coherent(&pdev->dev, tx_ring->size,
1811 &tx_ring->dma, 1811 &tx_ring->dma, GFP_KERNEL);
1812 GFP_KERNEL | __GFP_ZERO);
1813 if (!tx_ring->desc) { 1812 if (!tx_ring->desc) {
1814 vfree(tx_ring->buffer_info); 1813 vfree(tx_ring->buffer_info);
1815 return -ENOMEM; 1814 return -ENOMEM;
@@ -1852,9 +1851,8 @@ int pch_gbe_setup_rx_resources(struct pch_gbe_adapter *adapter,
1852 return -ENOMEM; 1851 return -ENOMEM;
1853 1852
1854 rx_ring->size = rx_ring->count * (int)sizeof(struct pch_gbe_rx_desc); 1853 rx_ring->size = rx_ring->count * (int)sizeof(struct pch_gbe_rx_desc);
1855 rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size, 1854 rx_ring->desc = dma_zalloc_coherent(&pdev->dev, rx_ring->size,
1856 &rx_ring->dma, 1855 &rx_ring->dma, GFP_KERNEL);
1857 GFP_KERNEL | __GFP_ZERO);
1858 if (!rx_ring->desc) { 1856 if (!rx_ring->desc) {
1859 vfree(rx_ring->buffer_info); 1857 vfree(rx_ring->buffer_info);
1860 return -ENOMEM; 1858 return -ENOMEM;
diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c
index f21ae7b6c766..c498181a9aa8 100644
--- a/drivers/net/ethernet/pasemi/pasemi_mac.c
+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c
@@ -440,10 +440,9 @@ static int pasemi_mac_setup_rx_resources(const struct net_device *dev)
440 if (pasemi_dma_alloc_ring(&ring->chan, RX_RING_SIZE)) 440 if (pasemi_dma_alloc_ring(&ring->chan, RX_RING_SIZE))
441 goto out_ring_desc; 441 goto out_ring_desc;
442 442
443 ring->buffers = dma_alloc_coherent(&mac->dma_pdev->dev, 443 ring->buffers = dma_zalloc_coherent(&mac->dma_pdev->dev,
444 RX_RING_SIZE * sizeof(u64), 444 RX_RING_SIZE * sizeof(u64),
445 &ring->buf_dma, 445 &ring->buf_dma, GFP_KERNEL);
446 GFP_KERNEL | __GFP_ZERO);
447 if (!ring->buffers) 446 if (!ring->buffers)
448 goto out_ring_desc; 447 goto out_ring_desc;
449 448
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
index bf3b17eaf8b8..86850dd633a1 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
@@ -448,14 +448,14 @@ int qlcnic_82xx_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter,
448 *(tx_ring->hw_consumer) = 0; 448 *(tx_ring->hw_consumer) = 0;
449 449
450 rq_size = SIZEOF_HOSTRQ_TX(struct qlcnic_hostrq_tx_ctx); 450 rq_size = SIZEOF_HOSTRQ_TX(struct qlcnic_hostrq_tx_ctx);
451 rq_addr = dma_alloc_coherent(&adapter->pdev->dev, rq_size, 451 rq_addr = dma_zalloc_coherent(&adapter->pdev->dev, rq_size,
452 &rq_phys_addr, GFP_KERNEL | __GFP_ZERO); 452 &rq_phys_addr, GFP_KERNEL);
453 if (!rq_addr) 453 if (!rq_addr)
454 return -ENOMEM; 454 return -ENOMEM;
455 455
456 rsp_size = SIZEOF_CARDRSP_TX(struct qlcnic_cardrsp_tx_ctx); 456 rsp_size = SIZEOF_CARDRSP_TX(struct qlcnic_cardrsp_tx_ctx);
457 rsp_addr = dma_alloc_coherent(&adapter->pdev->dev, rsp_size, 457 rsp_addr = dma_zalloc_coherent(&adapter->pdev->dev, rsp_size,
458 &rsp_phys_addr, GFP_KERNEL | __GFP_ZERO); 458 &rsp_phys_addr, GFP_KERNEL);
459 if (!rsp_addr) { 459 if (!rsp_addr) {
460 err = -ENOMEM; 460 err = -ENOMEM;
461 goto out_free_rq; 461 goto out_free_rq;
@@ -865,8 +865,8 @@ int qlcnic_82xx_get_nic_info(struct qlcnic_adapter *adapter,
865 struct qlcnic_cmd_args cmd; 865 struct qlcnic_cmd_args cmd;
866 size_t nic_size = sizeof(struct qlcnic_info_le); 866 size_t nic_size = sizeof(struct qlcnic_info_le);
867 867
868 nic_info_addr = dma_alloc_coherent(&adapter->pdev->dev, nic_size, 868 nic_info_addr = dma_zalloc_coherent(&adapter->pdev->dev, nic_size,
869 &nic_dma_t, GFP_KERNEL | __GFP_ZERO); 869 &nic_dma_t, GFP_KERNEL);
870 if (!nic_info_addr) 870 if (!nic_info_addr)
871 return -ENOMEM; 871 return -ENOMEM;
872 872
@@ -919,8 +919,8 @@ int qlcnic_82xx_set_nic_info(struct qlcnic_adapter *adapter,
919 if (adapter->ahw->op_mode != QLCNIC_MGMT_FUNC) 919 if (adapter->ahw->op_mode != QLCNIC_MGMT_FUNC)
920 return err; 920 return err;
921 921
922 nic_info_addr = dma_alloc_coherent(&adapter->pdev->dev, nic_size, 922 nic_info_addr = dma_zalloc_coherent(&adapter->pdev->dev, nic_size,
923 &nic_dma_t, GFP_KERNEL | __GFP_ZERO); 923 &nic_dma_t, GFP_KERNEL);
924 if (!nic_info_addr) 924 if (!nic_info_addr)
925 return -ENOMEM; 925 return -ENOMEM;
926 926
@@ -972,9 +972,8 @@ int qlcnic_82xx_get_pci_info(struct qlcnic_adapter *adapter,
972 size_t npar_size = sizeof(struct qlcnic_pci_info_le); 972 size_t npar_size = sizeof(struct qlcnic_pci_info_le);
973 size_t pci_size = npar_size * QLCNIC_MAX_PCI_FUNC; 973 size_t pci_size = npar_size * QLCNIC_MAX_PCI_FUNC;
974 974
975 pci_info_addr = dma_alloc_coherent(&adapter->pdev->dev, pci_size, 975 pci_info_addr = dma_zalloc_coherent(&adapter->pdev->dev, pci_size,
976 &pci_info_dma_t, 976 &pci_info_dma_t, GFP_KERNEL);
977 GFP_KERNEL | __GFP_ZERO);
978 if (!pci_info_addr) 977 if (!pci_info_addr)
979 return -ENOMEM; 978 return -ENOMEM;
980 979
@@ -1074,8 +1073,8 @@ int qlcnic_get_port_stats(struct qlcnic_adapter *adapter, const u8 func,
1074 return -EIO; 1073 return -EIO;
1075 } 1074 }
1076 1075
1077 stats_addr = dma_alloc_coherent(&adapter->pdev->dev, stats_size, 1076 stats_addr = dma_zalloc_coherent(&adapter->pdev->dev, stats_size,
1078 &stats_dma_t, GFP_KERNEL | __GFP_ZERO); 1077 &stats_dma_t, GFP_KERNEL);
1079 if (!stats_addr) 1078 if (!stats_addr)
1080 return -ENOMEM; 1079 return -ENOMEM;
1081 1080
@@ -1130,8 +1129,8 @@ int qlcnic_get_mac_stats(struct qlcnic_adapter *adapter,
1130 if (mac_stats == NULL) 1129 if (mac_stats == NULL)
1131 return -ENOMEM; 1130 return -ENOMEM;
1132 1131
1133 stats_addr = dma_alloc_coherent(&adapter->pdev->dev, stats_size, 1132 stats_addr = dma_zalloc_coherent(&adapter->pdev->dev, stats_size,
1134 &stats_dma_t, GFP_KERNEL | __GFP_ZERO); 1133 &stats_dma_t, GFP_KERNEL);
1135 if (!stats_addr) 1134 if (!stats_addr)
1136 return -ENOMEM; 1135 return -ENOMEM;
1137 1136
diff --git a/drivers/net/ethernet/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c
index b9b127743a07..78d413312052 100644
--- a/drivers/net/ethernet/sfc/nic.c
+++ b/drivers/net/ethernet/sfc/nic.c
@@ -33,9 +33,8 @@
33int efx_nic_alloc_buffer(struct efx_nic *efx, struct efx_buffer *buffer, 33int efx_nic_alloc_buffer(struct efx_nic *efx, struct efx_buffer *buffer,
34 unsigned int len, gfp_t gfp_flags) 34 unsigned int len, gfp_t gfp_flags)
35{ 35{
36 buffer->addr = dma_alloc_coherent(&efx->pci_dev->dev, len, 36 buffer->addr = dma_zalloc_coherent(&efx->pci_dev->dev, len,
37 &buffer->dma_addr, 37 &buffer->dma_addr, gfp_flags);
38 gfp_flags | __GFP_ZERO);
39 if (!buffer->addr) 38 if (!buffer->addr)
40 return -ENOMEM; 39 return -ENOMEM;
41 buffer->len = len; 40 buffer->len = len;
diff --git a/drivers/net/ethernet/sgi/meth.c b/drivers/net/ethernet/sgi/meth.c
index 9f5f35e041ac..770036bc2d87 100644
--- a/drivers/net/ethernet/sgi/meth.c
+++ b/drivers/net/ethernet/sgi/meth.c
@@ -212,9 +212,8 @@ static void meth_check_link(struct net_device *dev)
212static int meth_init_tx_ring(struct meth_private *priv) 212static int meth_init_tx_ring(struct meth_private *priv)
213{ 213{
214 /* Init TX ring */ 214 /* Init TX ring */
215 priv->tx_ring = dma_alloc_coherent(NULL, TX_RING_BUFFER_SIZE, 215 priv->tx_ring = dma_zalloc_coherent(NULL, TX_RING_BUFFER_SIZE,
216 &priv->tx_ring_dma, 216 &priv->tx_ring_dma, GFP_ATOMIC);
217 GFP_ATOMIC | __GFP_ZERO);
218 if (!priv->tx_ring) 217 if (!priv->tx_ring)
219 return -ENOMEM; 218 return -ENOMEM;
220 219
diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c
index 01bdc6ca0755..f2e76c9d736c 100644
--- a/drivers/net/ethernet/tundra/tsi108_eth.c
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
@@ -1308,13 +1308,13 @@ static int tsi108_open(struct net_device *dev)
1308 data->id, dev->irq, dev->name); 1308 data->id, dev->irq, dev->name);
1309 } 1309 }
1310 1310
1311 data->rxring = dma_alloc_coherent(NULL, rxring_size, &data->rxdma, 1311 data->rxring = dma_zalloc_coherent(NULL, rxring_size, &data->rxdma,
1312 GFP_KERNEL | __GFP_ZERO); 1312 GFP_KERNEL);
1313 if (!data->rxring) 1313 if (!data->rxring)
1314 return -ENOMEM; 1314 return -ENOMEM;
1315 1315
1316 data->txring = dma_alloc_coherent(NULL, txring_size, &data->txdma, 1316 data->txring = dma_zalloc_coherent(NULL, txring_size, &data->txdma,
1317 GFP_KERNEL | __GFP_ZERO); 1317 GFP_KERNEL);
1318 if (!data->txring) { 1318 if (!data->txring) {
1319 pci_free_consistent(0, rxring_size, data->rxring, data->rxdma); 1319 pci_free_consistent(0, rxring_size, data->rxring, data->rxdma);
1320 return -ENOMEM; 1320 return -ENOMEM;
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 58eb4488beff..b88121f240ca 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -243,15 +243,15 @@ static int temac_dma_bd_init(struct net_device *ndev)
243 243
244 /* allocate the tx and rx ring buffer descriptors. */ 244 /* allocate the tx and rx ring buffer descriptors. */
245 /* returns a virtual address and a physical address. */ 245 /* returns a virtual address and a physical address. */
246 lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent, 246 lp->tx_bd_v = dma_zalloc_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 | __GFP_ZERO); 248 &lp->tx_bd_p, GFP_KERNEL);
249 if (!lp->tx_bd_v) 249 if (!lp->tx_bd_v)
250 goto out; 250 goto out;
251 251
252 lp->rx_bd_v = dma_alloc_coherent(ndev->dev.parent, 252 lp->rx_bd_v = dma_zalloc_coherent(ndev->dev.parent,
253 sizeof(*lp->rx_bd_v) * RX_BD_NUM, 253 sizeof(*lp->rx_bd_v) * RX_BD_NUM,
254 &lp->rx_bd_p, GFP_KERNEL | __GFP_ZERO); 254 &lp->rx_bd_p, GFP_KERNEL);
255 if (!lp->rx_bd_v) 255 if (!lp->rx_bd_v)
256 goto out; 256 goto out;
257 257
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index fb7d1c28a2ea..b2ff038d6d20 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -201,17 +201,15 @@ static int axienet_dma_bd_init(struct net_device *ndev)
201 /* 201 /*
202 * Allocate the Tx and Rx buffer descriptors. 202 * Allocate the Tx and Rx buffer descriptors.
203 */ 203 */
204 lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent, 204 lp->tx_bd_v = dma_zalloc_coherent(ndev->dev.parent,
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, GFP_KERNEL);
207 GFP_KERNEL | __GFP_ZERO);
208 if (!lp->tx_bd_v) 207 if (!lp->tx_bd_v)
209 goto out; 208 goto out;
210 209
211 lp->rx_bd_v = dma_alloc_coherent(ndev->dev.parent, 210 lp->rx_bd_v = dma_zalloc_coherent(ndev->dev.parent,
212 sizeof(*lp->rx_bd_v) * RX_BD_NUM, 211 sizeof(*lp->rx_bd_v) * RX_BD_NUM,
213 &lp->rx_bd_p, 212 &lp->rx_bd_p, GFP_KERNEL);
214 GFP_KERNEL | __GFP_ZERO);
215 if (!lp->rx_bd_v) 213 if (!lp->rx_bd_v)
216 goto out; 214 goto out;
217 215
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
index 4c8ddc944d51..0b40e1c46f07 100644
--- a/drivers/net/fddi/defxx.c
+++ b/drivers/net/fddi/defxx.c
@@ -1068,9 +1068,9 @@ static int dfx_driver_init(struct net_device *dev, const char *print_name,
1068#endif 1068#endif
1069 sizeof(PI_CONSUMER_BLOCK) + 1069 sizeof(PI_CONSUMER_BLOCK) +
1070 (PI_ALIGN_K_DESC_BLK - 1); 1070 (PI_ALIGN_K_DESC_BLK - 1);
1071 bp->kmalloced = top_v = dma_alloc_coherent(bp->bus_dev, alloc_size, 1071 bp->kmalloced = top_v = dma_zalloc_coherent(bp->bus_dev, alloc_size,
1072 &bp->kmalloced_dma, 1072 &bp->kmalloced_dma,
1073 GFP_ATOMIC | __GFP_ZERO); 1073 GFP_ATOMIC);
1074 if (top_v == NULL) 1074 if (top_v == NULL)
1075 return DFX_K_FAILURE; 1075 return DFX_K_FAILURE;
1076 1076
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index 3adb43ce138f..7bbd318bc93e 100644
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -351,16 +351,16 @@ static int ali_ircc_open(int i, chipio_t *info)
351 351
352 /* Allocate memory if needed */ 352 /* Allocate memory if needed */
353 self->rx_buff.head = 353 self->rx_buff.head =
354 dma_alloc_coherent(NULL, self->rx_buff.truesize, 354 dma_zalloc_coherent(NULL, self->rx_buff.truesize,
355 &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO); 355 &self->rx_buff_dma, GFP_KERNEL);
356 if (self->rx_buff.head == NULL) { 356 if (self->rx_buff.head == NULL) {
357 err = -ENOMEM; 357 err = -ENOMEM;
358 goto err_out2; 358 goto err_out2;
359 } 359 }
360 360
361 self->tx_buff.head = 361 self->tx_buff.head =
362 dma_alloc_coherent(NULL, self->tx_buff.truesize, 362 dma_zalloc_coherent(NULL, self->tx_buff.truesize,
363 &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO); 363 &self->tx_buff_dma, GFP_KERNEL);
364 if (self->tx_buff.head == NULL) { 364 if (self->tx_buff.head == NULL) {
365 err = -ENOMEM; 365 err = -ENOMEM;
366 goto err_out3; 366 goto err_out3;
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index 9cf836b57c49..ceeb53737f86 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -430,8 +430,8 @@ static int __init nsc_ircc_open(chipio_t *info)
430 430
431 /* Allocate memory if needed */ 431 /* Allocate memory if needed */
432 self->rx_buff.head = 432 self->rx_buff.head =
433 dma_alloc_coherent(NULL, self->rx_buff.truesize, 433 dma_zalloc_coherent(NULL, self->rx_buff.truesize,
434 &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO); 434 &self->rx_buff_dma, GFP_KERNEL);
435 if (self->rx_buff.head == NULL) { 435 if (self->rx_buff.head == NULL) {
436 err = -ENOMEM; 436 err = -ENOMEM;
437 goto out2; 437 goto out2;
@@ -439,8 +439,8 @@ static int __init nsc_ircc_open(chipio_t *info)
439 } 439 }
440 440
441 self->tx_buff.head = 441 self->tx_buff.head =
442 dma_alloc_coherent(NULL, self->tx_buff.truesize, 442 dma_zalloc_coherent(NULL, self->tx_buff.truesize,
443 &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO); 443 &self->tx_buff_dma, GFP_KERNEL);
444 if (self->tx_buff.head == NULL) { 444 if (self->tx_buff.head == NULL) {
445 err = -ENOMEM; 445 err = -ENOMEM;
446 goto out3; 446 goto out3;
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index aa05dad75335..0dcdf1592f6b 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -562,14 +562,14 @@ static int smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u8 dma,
562 self->tx_buff.truesize = SMSC_IRCC2_TX_BUFF_TRUESIZE; 562 self->tx_buff.truesize = SMSC_IRCC2_TX_BUFF_TRUESIZE;
563 563
564 self->rx_buff.head = 564 self->rx_buff.head =
565 dma_alloc_coherent(NULL, self->rx_buff.truesize, 565 dma_zalloc_coherent(NULL, self->rx_buff.truesize,
566 &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO); 566 &self->rx_buff_dma, GFP_KERNEL);
567 if (self->rx_buff.head == NULL) 567 if (self->rx_buff.head == NULL)
568 goto err_out2; 568 goto err_out2;
569 569
570 self->tx_buff.head = 570 self->tx_buff.head =
571 dma_alloc_coherent(NULL, self->tx_buff.truesize, 571 dma_zalloc_coherent(NULL, self->tx_buff.truesize,
572 &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO); 572 &self->tx_buff_dma, GFP_KERNEL);
573 if (self->tx_buff.head == NULL) 573 if (self->tx_buff.head == NULL)
574 goto err_out3; 574 goto err_out3;
575 575
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index 2dcc60fb37f1..9abaec27f962 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -361,16 +361,16 @@ static int via_ircc_open(struct pci_dev *pdev, chipio_t *info, unsigned int id)
361 361
362 /* Allocate memory if needed */ 362 /* Allocate memory if needed */
363 self->rx_buff.head = 363 self->rx_buff.head =
364 dma_alloc_coherent(&pdev->dev, self->rx_buff.truesize, 364 dma_zalloc_coherent(&pdev->dev, self->rx_buff.truesize,
365 &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO); 365 &self->rx_buff_dma, GFP_KERNEL);
366 if (self->rx_buff.head == NULL) { 366 if (self->rx_buff.head == NULL) {
367 err = -ENOMEM; 367 err = -ENOMEM;
368 goto err_out2; 368 goto err_out2;
369 } 369 }
370 370
371 self->tx_buff.head = 371 self->tx_buff.head =
372 dma_alloc_coherent(&pdev->dev, self->tx_buff.truesize, 372 dma_zalloc_coherent(&pdev->dev, self->tx_buff.truesize,
373 &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO); 373 &self->tx_buff_dma, GFP_KERNEL);
374 if (self->tx_buff.head == NULL) { 374 if (self->tx_buff.head == NULL) {
375 err = -ENOMEM; 375 err = -ENOMEM;
376 goto err_out3; 376 goto err_out3;
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c
index bb8857a158a6..e641bb240362 100644
--- a/drivers/net/irda/w83977af_ir.c
+++ b/drivers/net/irda/w83977af_ir.c
@@ -215,16 +215,16 @@ static int w83977af_open(int i, unsigned int iobase, unsigned int irq,
215 215
216 /* Allocate memory if needed */ 216 /* Allocate memory if needed */
217 self->rx_buff.head = 217 self->rx_buff.head =
218 dma_alloc_coherent(NULL, self->rx_buff.truesize, 218 dma_zalloc_coherent(NULL, self->rx_buff.truesize,
219 &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO); 219 &self->rx_buff_dma, GFP_KERNEL);
220 if (self->rx_buff.head == NULL) { 220 if (self->rx_buff.head == NULL) {
221 err = -ENOMEM; 221 err = -ENOMEM;
222 goto err_out1; 222 goto err_out1;
223 } 223 }
224 224
225 self->tx_buff.head = 225 self->tx_buff.head =
226 dma_alloc_coherent(NULL, self->tx_buff.truesize, 226 dma_zalloc_coherent(NULL, self->tx_buff.truesize,
227 &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO); 227 &self->tx_buff_dma, GFP_KERNEL);
228 if (self->tx_buff.head == NULL) { 228 if (self->tx_buff.head == NULL) {
229 err = -ENOMEM; 229 err = -ENOMEM;
230 goto err_out2; 230 goto err_out2;
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
index f7c70b3a6ea9..c51d2dc489e4 100644
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
@@ -431,9 +431,9 @@ static int alloc_ringmemory(struct b43_dmaring *ring)
431 u16 ring_mem_size = (ring->type == B43_DMA_64BIT) ? 431 u16 ring_mem_size = (ring->type == B43_DMA_64BIT) ?
432 B43_DMA64_RINGMEMSIZE : B43_DMA32_RINGMEMSIZE; 432 B43_DMA64_RINGMEMSIZE : B43_DMA32_RINGMEMSIZE;
433 433
434 ring->descbase = dma_alloc_coherent(ring->dev->dev->dma_dev, 434 ring->descbase = dma_zalloc_coherent(ring->dev->dev->dma_dev,
435 ring_mem_size, &(ring->dmabase), 435 ring_mem_size, &(ring->dmabase),
436 GFP_KERNEL | __GFP_ZERO); 436 GFP_KERNEL);
437 if (!ring->descbase) 437 if (!ring->descbase)
438 return -ENOMEM; 438 return -ENOMEM;
439 439
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
index faeafe219c57..42eb26c99e11 100644
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@ -331,10 +331,9 @@ void free_descriptor_buffer(struct b43legacy_dmaring *ring,
331static int alloc_ringmemory(struct b43legacy_dmaring *ring) 331static int alloc_ringmemory(struct b43legacy_dmaring *ring)
332{ 332{
333 /* GFP flags must match the flags in free_ringmemory()! */ 333 /* GFP flags must match the flags in free_ringmemory()! */
334 ring->descbase = dma_alloc_coherent(ring->dev->dev->dma_dev, 334 ring->descbase = dma_zalloc_coherent(ring->dev->dev->dma_dev,
335 B43legacy_DMA_RINGMEMSIZE, 335 B43legacy_DMA_RINGMEMSIZE,
336 &(ring->dmabase), 336 &(ring->dmabase), GFP_KERNEL);
337 GFP_KERNEL | __GFP_ZERO);
338 if (!ring->descbase) 337 if (!ring->descbase)
339 return -ENOMEM; 338 return -ENOMEM;
340 339
generated by cgit v1.2.2 (git 2.25.0) at 2026-04-05 10:12:47 -0400