diff options
| author | Joe Perches <joe@perches.com> | 2013-03-15 07:23:58 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-17 12:50:24 -0400 |
| commit | 1f9061d27d3d2028805549c4a306324a48209057 (patch) | |
| tree | 7cfb1a92933f5a9bba6745b68b6a964d9e757ef9 /drivers/net/ethernet/aeroflex/greth.c | |
| parent | 7f9421c264f8a6e6137027a45ae576517f66fa56 (diff) | |
| download | linux-1f9061d27d3d2028805549c4a306324a48209057.tar.gz linux-1f9061d27d3d2028805549c4a306324a48209057.tar.bz2 linux-1f9061d27d3d2028805549c4a306324a48209057.zip | |
drivers:net: dma_alloc_coherent: use __GFP_ZERO instead of memset(, 0)
Reduce the number of calls required to alloc
a zeroed block of memory.
Trivially reduces overall object size.
Other changes around these removals
o Neaten call argument alignment
o Remove an unnecessary OOM message after dma_alloc_coherent failure
o Remove unnecessary gfp_t stack variable
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/aeroflex/greth.c')
| -rw-r--r-- | drivers/net/ethernet/aeroflex/greth.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c index 3a9fbacc3729..269295403fc4 100644 --- a/drivers/net/ethernet/aeroflex/greth.c +++ b/drivers/net/ethernet/aeroflex/greth.c @@ -1466,25 +1466,21 @@ static int greth_of_probe(struct platform_device *ofdev) /* Allocate TX descriptor ring in coherent memory */ greth->tx_bd_base = dma_alloc_coherent(greth->dev, 1024, &greth->tx_bd_base_phys, - GFP_KERNEL); + GFP_KERNEL | __GFP_ZERO); if (!greth->tx_bd_base) { err = -ENOMEM; goto error3; } - memset(greth->tx_bd_base, 0, 1024); - /* Allocate RX descriptor ring in coherent memory */ greth->rx_bd_base = dma_alloc_coherent(greth->dev, 1024, &greth->rx_bd_base_phys, - GFP_KERNEL); + GFP_KERNEL | __GFP_ZERO); if (!greth->rx_bd_base) { err = -ENOMEM; goto error4; } - memset(greth->rx_bd_base, 0, 1024); - /* Get MAC address from: module param, OF property or ID prom */ for (i = 0; i < 6; i++) { if (macaddr[i] != 0) |