diff options
author | Joe Perches <joe@perches.com> | 2013-03-15 03:23:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-17 12:50:24 -0400 |
commit | 1f9061d27d3d2028805549c4a306324a48209057 (patch) | |
tree | 7cfb1a92933f5a9bba6745b68b6a964d9e757ef9 /drivers/net/ethernet/myricom/myri10ge | |
parent | 7f9421c264f8a6e6137027a45ae576517f66fa56 (diff) |
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/myricom/myri10ge')
-rw-r--r-- | drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index 4f9937e026e5..d5ffdc8264eb 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c | |||
@@ -3592,10 +3592,9 @@ static int myri10ge_alloc_slices(struct myri10ge_priv *mgp) | |||
3592 | bytes = mgp->max_intr_slots * sizeof(*ss->rx_done.entry); | 3592 | bytes = mgp->max_intr_slots * sizeof(*ss->rx_done.entry); |
3593 | ss->rx_done.entry = dma_alloc_coherent(&pdev->dev, bytes, | 3593 | ss->rx_done.entry = dma_alloc_coherent(&pdev->dev, bytes, |
3594 | &ss->rx_done.bus, | 3594 | &ss->rx_done.bus, |
3595 | GFP_KERNEL); | 3595 | GFP_KERNEL | __GFP_ZERO); |
3596 | if (ss->rx_done.entry == NULL) | 3596 | if (ss->rx_done.entry == NULL) |
3597 | goto abort; | 3597 | goto abort; |
3598 | memset(ss->rx_done.entry, 0, bytes); | ||
3599 | bytes = sizeof(*ss->fw_stats); | 3598 | bytes = sizeof(*ss->fw_stats); |
3600 | ss->fw_stats = dma_alloc_coherent(&pdev->dev, bytes, | 3599 | ss->fw_stats = dma_alloc_coherent(&pdev->dev, bytes, |
3601 | &ss->fw_stats_bus, | 3600 | &ss->fw_stats_bus, |