Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6443b24 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

mwl8k: use pci_zalloc_consistent 



Remove the now unnecessary memset too.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Lennert Buytenhek <buytenh@wantstofly.org>
Cc: "John W. Linville" <linville@tuxdriver.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f0b6539c

drivers/net/wireless/mwl8k.c

+2 −4
Original line number Diff line number Diff line
@@ -1159,12 +1159,11 @@ static int mwl8k_rxq_init(struct ieee80211_hw *hw, int index) 


	size = MWL8K_RX_DESCS * priv->rxd_ops->rxd_size;



	rxq->rxd = pci_alloc_consistent(priv->pdev, size, &rxq->rxd_dma);

	rxq->rxd = pci_zalloc_consistent(priv->pdev, size, &rxq->rxd_dma);

	if (rxq->rxd == NULL) {

		wiphy_err(hw->wiphy, "failed to alloc RX descriptors\n");

		return -ENOMEM;

	}

	memset(rxq->rxd, 0, size);



	rxq->buf = kcalloc(MWL8K_RX_DESCS, sizeof(*rxq->buf), GFP_KERNEL);

	if (rxq->buf == NULL) {
@@ -1451,12 +1450,11 @@ static int mwl8k_txq_init(struct ieee80211_hw *hw, int index) 


	size = MWL8K_TX_DESCS * sizeof(struct mwl8k_tx_desc);



	txq->txd = pci_alloc_consistent(priv->pdev, size, &txq->txd_dma);

	txq->txd = pci_zalloc_consistent(priv->pdev, size, &txq->txd_dma);

	if (txq->txd == NULL) {

		wiphy_err(hw->wiphy, "failed to alloc TX descriptors\n");

		return -ENOMEM;

	}

	memset(txq->txd, 0, size);



	txq->skb = kcalloc(MWL8K_TX_DESCS, sizeof(*txq->skb), GFP_KERNEL);

	if (txq->skb == NULL) {