diff options
author | Shan Wei <shanwei@cn.fujitsu.com> | 2011-03-07 22:02:03 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-03-09 16:10:45 -0500 |
commit | b9ede5f1dc03f96949dcaa8f8b3483766c047260 (patch) | |
tree | 8b33c42e345cdaa5d9954043ed1b001e125714cd /drivers/net/wireless | |
parent | d07bfd8b6f20a81d7ec65c50f35b053d9e3aa740 (diff) |
mwl8k: use kcalloc instead of kmalloc & memset
Use kcalloc or kzalloc rather than the combination of kmalloc and memset.
Thanks coccicheck for detecting this.
(http://coccinelle.lip6.fr/)
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/mwl8k.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index df5959f36d0b..36952274950e 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
@@ -1056,13 +1056,12 @@ static int mwl8k_rxq_init(struct ieee80211_hw *hw, int index) | |||
1056 | } | 1056 | } |
1057 | memset(rxq->rxd, 0, size); | 1057 | memset(rxq->rxd, 0, size); |
1058 | 1058 | ||
1059 | rxq->buf = kmalloc(MWL8K_RX_DESCS * sizeof(*rxq->buf), GFP_KERNEL); | 1059 | rxq->buf = kcalloc(MWL8K_RX_DESCS, sizeof(*rxq->buf), GFP_KERNEL); |
1060 | if (rxq->buf == NULL) { | 1060 | if (rxq->buf == NULL) { |
1061 | wiphy_err(hw->wiphy, "failed to alloc RX skbuff list\n"); | 1061 | wiphy_err(hw->wiphy, "failed to alloc RX skbuff list\n"); |
1062 | pci_free_consistent(priv->pdev, size, rxq->rxd, rxq->rxd_dma); | 1062 | pci_free_consistent(priv->pdev, size, rxq->rxd, rxq->rxd_dma); |
1063 | return -ENOMEM; | 1063 | return -ENOMEM; |
1064 | } | 1064 | } |
1065 | memset(rxq->buf, 0, MWL8K_RX_DESCS * sizeof(*rxq->buf)); | ||
1066 | 1065 | ||
1067 | for (i = 0; i < MWL8K_RX_DESCS; i++) { | 1066 | for (i = 0; i < MWL8K_RX_DESCS; i++) { |
1068 | int desc_size; | 1067 | int desc_size; |
@@ -1347,13 +1346,12 @@ static int mwl8k_txq_init(struct ieee80211_hw *hw, int index) | |||
1347 | } | 1346 | } |
1348 | memset(txq->txd, 0, size); | 1347 | memset(txq->txd, 0, size); |
1349 | 1348 | ||
1350 | txq->skb = kmalloc(MWL8K_TX_DESCS * sizeof(*txq->skb), GFP_KERNEL); | 1349 | txq->skb = kcalloc(MWL8K_TX_DESCS, sizeof(*txq->skb), GFP_KERNEL); |
1351 | if (txq->skb == NULL) { | 1350 | if (txq->skb == NULL) { |
1352 | wiphy_err(hw->wiphy, "failed to alloc TX skbuff list\n"); | 1351 | wiphy_err(hw->wiphy, "failed to alloc TX skbuff list\n"); |
1353 | pci_free_consistent(priv->pdev, size, txq->txd, txq->txd_dma); | 1352 | pci_free_consistent(priv->pdev, size, txq->txd, txq->txd_dma); |
1354 | return -ENOMEM; | 1353 | return -ENOMEM; |
1355 | } | 1354 | } |
1356 | memset(txq->skb, 0, MWL8K_TX_DESCS * sizeof(*txq->skb)); | ||
1357 | 1355 | ||
1358 | for (i = 0; i < MWL8K_TX_DESCS; i++) { | 1356 | for (i = 0; i < MWL8K_TX_DESCS; i++) { |
1359 | struct mwl8k_tx_desc *tx_desc; | 1357 | struct mwl8k_tx_desc *tx_desc; |