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/faraday/ftmac100.c | |
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/faraday/ftmac100.c')
-rw-r--r-- | drivers/net/ethernet/faraday/ftmac100.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c index b5ea8fbd8a76..a6eda8d83138 100644 --- a/drivers/net/ethernet/faraday/ftmac100.c +++ b/drivers/net/ethernet/faraday/ftmac100.c | |||
@@ -732,13 +732,13 @@ 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, sizeof(struct ftmac100_descs), | 735 | priv->descs = dma_alloc_coherent(priv->dev, |
736 | &priv->descs_dma_addr, GFP_KERNEL); | 736 | sizeof(struct ftmac100_descs), |
737 | &priv->descs_dma_addr, | ||
738 | GFP_KERNEL | __GFP_ZERO); | ||
737 | if (!priv->descs) | 739 | if (!priv->descs) |
738 | return -ENOMEM; | 740 | return -ENOMEM; |
739 | 741 | ||
740 | memset(priv->descs, 0, sizeof(struct ftmac100_descs)); | ||
741 | |||
742 | /* initialize RX ring */ | 742 | /* initialize RX ring */ |
743 | ftmac100_rxdes_set_end_of_ring(&priv->descs->rxdes[RX_QUEUE_ENTRIES - 1]); | 743 | ftmac100_rxdes_set_end_of_ring(&priv->descs->rxdes[RX_QUEUE_ENTRIES - 1]); |
744 | 744 | ||