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

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

rtl818x: use pci_zalloc_consistent 



Remove the now unnecessary memset too.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
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 e6443b24

drivers/net/wireless/rtl818x/rtl8180/dev.c

+4 −7
Original line number Diff line number Diff line
@@ -972,16 +972,13 @@ static int rtl8180_init_rx_ring(struct ieee80211_hw *dev) 
	else

		priv->rx_ring_sz = sizeof(struct rtl8180_rx_desc);



	priv->rx_ring = pci_alloc_consistent(priv->pdev,

					     priv->rx_ring_sz * 32,

	priv->rx_ring = pci_zalloc_consistent(priv->pdev, priv->rx_ring_sz * 32,

					      &priv->rx_ring_dma);



	if (!priv->rx_ring || (unsigned long)priv->rx_ring & 0xFF) {

		wiphy_err(dev->wiphy, "Cannot allocate RX ring\n");

		return -ENOMEM;

	}



	memset(priv->rx_ring, 0, priv->rx_ring_sz * 32);

	priv->rx_idx = 0;



	for (i = 0; i < 32; i++) {
@@ -1040,14 +1037,14 @@ static int rtl8180_init_tx_ring(struct ieee80211_hw *dev, 
	dma_addr_t dma;

	int i;



	ring = pci_alloc_consistent(priv->pdev, sizeof(*ring) * entries, &dma);

	ring = pci_zalloc_consistent(priv->pdev, sizeof(*ring) * entries,

				     &dma);

	if (!ring || (unsigned long)ring & 0xFF) {

		wiphy_err(dev->wiphy, "Cannot allocate TX ring (prio = %d)\n",

			  prio);

		return -ENOMEM;

	}



	memset(ring, 0, sizeof(*ring)*entries);

	priv->tx_ring[prio].desc = ring;

	priv->tx_ring[prio].dma = dma;

	priv->tx_ring[prio].idx = 0;