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

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

staging: use pci_zalloc_consistent 



Remove the now unnecessary memset too.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Lior Dotan <liodot@gmail.com>
Cc: Christopher Harrer <charrer@alacritech.com>
Cc: Forest Bond <forest@alittletooquiet.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7c845eb5

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+5 −10
Original line number Diff line number Diff line
@@ -2065,20 +2065,16 @@ static short rtl8192_alloc_rx_desc_ring(struct net_device *dev) 
	int i, rx_queue_idx;



	for (rx_queue_idx = 0; rx_queue_idx < MAX_RX_QUEUE; rx_queue_idx++) {

		priv->rx_ring[rx_queue_idx] = pci_alloc_consistent(priv->pdev,

					sizeof(*priv->rx_ring[rx_queue_idx]) *

					priv->rxringcount,

		priv->rx_ring[rx_queue_idx] =

			pci_zalloc_consistent(priv->pdev,

					      sizeof(*priv->rx_ring[rx_queue_idx]) * priv->rxringcount,

					      &priv->rx_ring_dma[rx_queue_idx]);



		if (!priv->rx_ring[rx_queue_idx] ||

		    (unsigned long)priv->rx_ring[rx_queue_idx] & 0xFF) {

			RT_TRACE(COMP_ERR, "Cannot allocate RX ring\n");

			return -ENOMEM;

		}



		memset(priv->rx_ring[rx_queue_idx], 0,

		       sizeof(*priv->rx_ring[rx_queue_idx]) *

		       priv->rxringcount);

		priv->rx_idx[rx_queue_idx] = 0;



		for (i = 0; i < priv->rxringcount; i++) {
@@ -2118,14 +2114,13 @@ static int rtl8192_alloc_tx_desc_ring(struct net_device *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) {

		RT_TRACE(COMP_ERR, "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;

drivers/staging/rtl8192ee/pci.c

+12 −25
Original line number Diff line number Diff line
@@ -1224,10 +1224,10 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw, 


	/* alloc tx buffer desc for new trx flow*/

	if (rtlpriv->use_new_trx_flow) {

		buffer_desc = pci_alloc_consistent(rtlpci->pdev,

		buffer_desc =

			pci_zalloc_consistent(rtlpci->pdev,

					      sizeof(*buffer_desc) * entries,

					      &buffer_desc_dma);



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

			RT_TRACE(COMP_ERR, DBG_EMERG,

				 ("Cannot allocate TX ring (prio = %d)\n",
@@ -1235,7 +1235,6 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw, 
			return -ENOMEM;

		}



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

		rtlpci->tx_ring[prio].buffer_desc = buffer_desc;

		rtlpci->tx_ring[prio].buffer_desc_dma = buffer_desc_dma;
@@ -1245,16 +1244,14 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw, 
	}



	/* alloc dma for this ring */

	desc = pci_alloc_consistent(rtlpci->pdev,

				    sizeof(*desc) * entries, &desc_dma);



	desc = pci_zalloc_consistent(rtlpci->pdev, sizeof(*desc) * entries,

				     &desc_dma);

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

		RT_TRACE(COMP_ERR, DBG_EMERG,

			 ("Cannot allocate TX ring (prio = %d)\n", prio));

		return -ENOMEM;

	}



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

	rtlpci->tx_ring[prio].desc = desc;

	rtlpci->tx_ring[prio].dma = desc_dma;
@@ -1290,10 +1287,8 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw, int rxring_idx) 
		struct rtl_rx_buffer_desc *entry = NULL;

		/* alloc dma for this ring */

		rtlpci->rx_ring[rxring_idx].buffer_desc =

		    pci_alloc_consistent(rtlpci->pdev,

					 sizeof(*rtlpci->rx_ring[rxring_idx].

						buffer_desc) *

						rtlpci->rxringcount,

			pci_zalloc_consistent(rtlpci->pdev,

					      sizeof(*rtlpci->rx_ring[rxring_idx].buffer_desc) * rtlpci->rxringcount,

					      &rtlpci->rx_ring[rxring_idx].dma);

		if (!rtlpci->rx_ring[rxring_idx].buffer_desc ||

		    (unsigned long)rtlpci->rx_ring[rxring_idx].buffer_desc & 0xFF) {
@@ -1302,10 +1297,6 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw, int rxring_idx) 
			return -ENOMEM;

		}



		memset(rtlpci->rx_ring[rxring_idx].buffer_desc, 0,

		       sizeof(*rtlpci->rx_ring[rxring_idx].buffer_desc) *

		       rtlpci->rxringcount);



		/* init every desc in this ring */

		rtlpci->rx_ring[rxring_idx].idx = 0;
@@ -1320,9 +1311,8 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw, int rxring_idx) 
		u8 tmp_one = 1;

		/* alloc dma for this ring */

		rtlpci->rx_ring[rxring_idx].desc =

		    pci_alloc_consistent(rtlpci->pdev,

					 sizeof(*rtlpci->rx_ring[rxring_idx].

					desc) * rtlpci->rxringcount,

			pci_zalloc_consistent(rtlpci->pdev,

					      sizeof(*rtlpci->rx_ring[rxring_idx].desc) * rtlpci->rxringcount,

					      &rtlpci->rx_ring[rxring_idx].dma);

		if (!rtlpci->rx_ring[rxring_idx].desc ||

		    (unsigned long)rtlpci->rx_ring[rxring_idx].desc & 0xFF) {
@@ -1330,9 +1320,6 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw, int rxring_idx) 
				 ("Cannot allocate RX ring\n"));

			return -ENOMEM;

		}

		memset(rtlpci->rx_ring[rxring_idx].desc, 0,

		       sizeof(*rtlpci->rx_ring[rxring_idx].desc) *

		       rtlpci->rxringcount);



		/* init every desc in this ring */

		rtlpci->rx_ring[rxring_idx].idx = 0;

drivers/staging/rtl8821ae/pci.c

+12 −24
Original line number Diff line number Diff line
@@ -1248,7 +1248,8 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw, 


	/* alloc tx buffer desc for new trx flow*/

	if (rtlpriv->use_new_trx_flow) {

		buffer_desc = pci_alloc_consistent(rtlpci->pdev,

		buffer_desc =

			pci_zalloc_consistent(rtlpci->pdev,

					      sizeof(*buffer_desc) * entries,

					      &buffer_desc_dma);
@@ -1259,7 +1260,6 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw, 
			return -ENOMEM;

		}



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

		rtlpci->tx_ring[prio].buffer_desc = buffer_desc;

		rtlpci->tx_ring[prio].buffer_desc_dma = buffer_desc_dma;
@@ -1270,8 +1270,8 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw, 
	}



	/* alloc dma for this ring */

	desc = pci_alloc_consistent(rtlpci->pdev,

				    sizeof(*desc) * entries, &desc_dma);

	desc = pci_zalloc_consistent(rtlpci->pdev, sizeof(*desc) * entries,

				     &desc_dma);



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

		RT_TRACE(COMP_ERR, DBG_EMERG,
@@ -1279,7 +1279,6 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw, 
		return -ENOMEM;

	}



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

	rtlpci->tx_ring[prio].desc = desc;

	rtlpci->tx_ring[prio].dma = desc_dma;
@@ -1316,10 +1315,8 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw, int rxring_idx) 
		struct rtl_rx_buffer_desc *entry = NULL;

		/* alloc dma for this ring */

		rtlpci->rx_ring[rxring_idx].buffer_desc =

		    pci_alloc_consistent(rtlpci->pdev,

					 sizeof(*rtlpci->rx_ring[rxring_idx].

					        buffer_desc) *

					        rtlpci->rxringcount,

			pci_zalloc_consistent(rtlpci->pdev,

					      sizeof(*rtlpci->rx_ring[rxring_idx].buffer_desc) * rtlpci->rxringcount,

					      &rtlpci->rx_ring[rxring_idx].dma);

		if (!rtlpci->rx_ring[rxring_idx].buffer_desc ||

		    (unsigned long)rtlpci->rx_ring[rxring_idx].buffer_desc & 0xFF) {
@@ -1327,10 +1324,6 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw, int rxring_idx) 
			return -ENOMEM;

		}



		memset(rtlpci->rx_ring[rxring_idx].buffer_desc, 0,

		       sizeof(*rtlpci->rx_ring[rxring_idx].buffer_desc) *

		       rtlpci->rxringcount);



		/* init every desc in this ring */

		rtlpci->rx_ring[rxring_idx].idx = 0;

		for (i = 0; i < rtlpci->rxringcount; i++) {
@@ -1344,9 +1337,8 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw, int rxring_idx) 
		u8 tmp_one = 1;

		/* alloc dma for this ring */

		rtlpci->rx_ring[rxring_idx].desc =

		    pci_alloc_consistent(rtlpci->pdev,

					 sizeof(*rtlpci->rx_ring[rxring_idx].

					        desc) * rtlpci->rxringcount,

			pci_zalloc_consistent(rtlpci->pdev,

					      sizeof(*rtlpci->rx_ring[rxring_idx].desc) * rtlpci->rxringcount,

					      &rtlpci->rx_ring[rxring_idx].dma);

		if (!rtlpci->rx_ring[rxring_idx].desc ||

		    (unsigned long)rtlpci->rx_ring[rxring_idx].desc & 0xFF) {
@@ -1355,10 +1347,6 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw, int rxring_idx) 
			return -ENOMEM;

		}



		memset(rtlpci->rx_ring[rxring_idx].desc, 0,

		       sizeof(*rtlpci->rx_ring[rxring_idx].desc) *

		       rtlpci->rxringcount);



		/* init every desc in this ring */

		rtlpci->rx_ring[rxring_idx].idx = 0;

		for (i = 0; i < rtlpci->rxringcount; i++) {

drivers/staging/slicoss/slicoss.c

+3 −6
Original line number Diff line number Diff line
@@ -1191,7 +1191,7 @@ static int slic_rspqueue_init(struct adapter *adapter) 
	rspq->num_pages = SLIC_RSPQ_PAGES_GB;



	for (i = 0; i < rspq->num_pages; i++) {

		rspq->vaddr[i] = pci_alloc_consistent(adapter->pcidev,

		rspq->vaddr[i] = pci_zalloc_consistent(adapter->pcidev,

						       PAGE_SIZE,

						       &rspq->paddr[i]);

		if (!rspq->vaddr[i]) {
@@ -1200,9 +1200,6 @@ static int slic_rspqueue_init(struct adapter *adapter) 
			slic_rspqueue_free(adapter);

			return -ENOMEM;

		}

		/* FIXME:

		 * do we really need this assertions (4K PAGE_SIZE aligned addr)? */

		memset(rspq->vaddr[i], 0, PAGE_SIZE);



		if (paddrh == 0) {

			slic_reg32_write(&slic_regs->slic_rbar,

drivers/staging/vt6655/device_main.c

+12 −28
Original line number Diff line number Diff line
@@ -1111,25 +1111,17 @@ static bool device_init_rings(PSDevice pDevice) 
	void *vir_pool;



	/*allocate all RD/TD rings a single pool*/

	vir_pool = pci_alloc_consistent(pDevice->pcid,

	vir_pool = pci_zalloc_consistent(pDevice->pcid,

					 pDevice->sOpts.nRxDescs0 * sizeof(SRxDesc) +

					 pDevice->sOpts.nRxDescs1 * sizeof(SRxDesc) +

					 pDevice->sOpts.nTxDescs[0] * sizeof(STxDesc) +

					 pDevice->sOpts.nTxDescs[1] * sizeof(STxDesc),

					 &pDevice->pool_dma);



	if (vir_pool == NULL) {

		DBG_PRT(MSG_LEVEL_ERR, KERN_ERR "%s : allocate desc dma memory failed\n", pDevice->dev->name);

		return false;

	}



	memset(vir_pool, 0,

	       pDevice->sOpts.nRxDescs0 * sizeof(SRxDesc) +

	       pDevice->sOpts.nRxDescs1 * sizeof(SRxDesc) +

	       pDevice->sOpts.nTxDescs[0] * sizeof(STxDesc) +

	       pDevice->sOpts.nTxDescs[1] * sizeof(STxDesc)

		);



	pDevice->aRD0Ring = vir_pool;

	pDevice->aRD1Ring = vir_pool +

		pDevice->sOpts.nRxDescs0 * sizeof(SRxDesc);
@@ -1138,13 +1130,12 @@ static bool device_init_rings(PSDevice pDevice) 
	pDevice->rd1_pool_dma = pDevice->rd0_pool_dma +

		pDevice->sOpts.nRxDescs0 * sizeof(SRxDesc);



	pDevice->tx0_bufs = pci_alloc_consistent(pDevice->pcid,

	pDevice->tx0_bufs = pci_zalloc_consistent(pDevice->pcid,

						  pDevice->sOpts.nTxDescs[0] * PKT_BUF_SZ +

						  pDevice->sOpts.nTxDescs[1] * PKT_BUF_SZ +

						  CB_BEACON_BUF_SIZE +

						  CB_MAX_BUF_SIZE,

						  &pDevice->tx_bufs_dma0);



	if (pDevice->tx0_bufs == NULL) {

		DBG_PRT(MSG_LEVEL_ERR, KERN_ERR "%s: allocate buf dma memory failed\n", pDevice->dev->name);

		pci_free_consistent(pDevice->pcid,
@@ -1157,13 +1148,6 @@ static bool device_init_rings(PSDevice pDevice) 
		return false;

	}



	memset(pDevice->tx0_bufs, 0,

	       pDevice->sOpts.nTxDescs[0] * PKT_BUF_SZ +

	       pDevice->sOpts.nTxDescs[1] * PKT_BUF_SZ +

	       CB_BEACON_BUF_SIZE +

	       CB_MAX_BUF_SIZE

		);



	pDevice->td0_pool_dma = pDevice->rd1_pool_dma +

		pDevice->sOpts.nRxDescs1 * sizeof(SRxDesc);