| From f9b4ed9ae06661e53e45507d4cab61cf0a192cc8 Mon Sep 17 00:00:00 2001 |
| From: Joe Perches <joe@perches.com> |
| Date: Mon, 26 Aug 2013 22:45:23 -0700 |
| Subject: 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> |
| (cherry picked from commit ede23fa8161c1a04aa1b3bf5447812ca14b3fef1) |
| Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp> |
| Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp> |
| --- |
| drivers/net/ethernet/xilinx/ll_temac_main.c | 12 ++++++------ |
| drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 14 ++++++-------- |
| 2 files changed, 12 insertions(+), 14 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c |
| index 96cb89795ee4..0029148077a9 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) |
| |
| /* allocate the tx and rx ring buffer descriptors. */ |
| /* returns a virtual address and a physical address. */ |
| - lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent, |
| - sizeof(*lp->tx_bd_v) * TX_BD_NUM, |
| - &lp->tx_bd_p, GFP_KERNEL | __GFP_ZERO); |
| + lp->tx_bd_v = dma_zalloc_coherent(ndev->dev.parent, |
| + sizeof(*lp->tx_bd_v) * TX_BD_NUM, |
| + &lp->tx_bd_p, GFP_KERNEL); |
| if (!lp->tx_bd_v) |
| goto out; |
| |
| - lp->rx_bd_v = dma_alloc_coherent(ndev->dev.parent, |
| - sizeof(*lp->rx_bd_v) * RX_BD_NUM, |
| - &lp->rx_bd_p, GFP_KERNEL | __GFP_ZERO); |
| + lp->rx_bd_v = dma_zalloc_coherent(ndev->dev.parent, |
| + sizeof(*lp->rx_bd_v) * RX_BD_NUM, |
| + &lp->rx_bd_p, GFP_KERNEL); |
| if (!lp->rx_bd_v) |
| goto out; |
| |
| 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) |
| /* |
| * Allocate the Tx and Rx buffer descriptors. |
| */ |
| - lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent, |
| - sizeof(*lp->tx_bd_v) * TX_BD_NUM, |
| - &lp->tx_bd_p, |
| - GFP_KERNEL | __GFP_ZERO); |
| + lp->tx_bd_v = dma_zalloc_coherent(ndev->dev.parent, |
| + sizeof(*lp->tx_bd_v) * TX_BD_NUM, |
| + &lp->tx_bd_p, GFP_KERNEL); |
| if (!lp->tx_bd_v) |
| goto out; |
| |
| - lp->rx_bd_v = dma_alloc_coherent(ndev->dev.parent, |
| - sizeof(*lp->rx_bd_v) * RX_BD_NUM, |
| - &lp->rx_bd_p, |
| - GFP_KERNEL | __GFP_ZERO); |
| + lp->rx_bd_v = dma_zalloc_coherent(ndev->dev.parent, |
| + sizeof(*lp->rx_bd_v) * RX_BD_NUM, |
| + &lp->rx_bd_p, GFP_KERNEL); |
| if (!lp->rx_bd_v) |
| goto out; |
| |
| -- |
| 1.8.5.rc3 |
| |