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

Commit e8992e40 authored by Zhu Yanjun's avatar Zhu Yanjun Committed by David S. Miller
Browse files

forcedeth: replace pci_alloc_consistent with dma_alloc_coherent 



The functions pci_alloc_consistent is obsolete. So it is replaced
with dma_alloc_coherent

Signed-off-by: default avatarZhu Yanjun <yanjun.zhu@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db329190

drivers/net/ethernet/nvidia/forcedeth.c

+41 −20
Original line number Diff line number Diff line
@@ -1024,11 +1024,17 @@ static void free_rings(struct net_device *dev) 


	if (!nv_optimized(np)) {

		if (np->rx_ring.orig)

			pci_free_consistent(np->pci_dev, sizeof(struct ring_desc) * (np->rx_ring_size + np->tx_ring_size),

			dma_free_coherent(&np->pci_dev->dev,

					  sizeof(struct ring_desc) *

					  (np->rx_ring_size +

					  np->tx_ring_size),

					  np->rx_ring.orig, np->ring_addr);

	} else {

		if (np->rx_ring.ex)

			pci_free_consistent(np->pci_dev, sizeof(struct ring_desc_ex) * (np->rx_ring_size + np->tx_ring_size),

			dma_free_coherent(&np->pci_dev->dev,

					  sizeof(struct ring_desc_ex) *

					  (np->rx_ring_size +

					  np->tx_ring_size),

					  np->rx_ring.ex, np->ring_addr);

	}

	kfree(np->rx_skb);
@@ -4596,13 +4602,17 @@ static int nv_set_ringparam(struct net_device *dev, struct ethtool_ringparam* ri 


	/* allocate new rings */

	if (!nv_optimized(np)) {

		rxtx_ring = pci_alloc_consistent(np->pci_dev,

					    sizeof(struct ring_desc) * (ring->rx_pending + ring->tx_pending),

					    &ring_addr);

		rxtx_ring = dma_alloc_coherent(&np->pci_dev->dev,

					       sizeof(struct ring_desc) *

					       (ring->rx_pending +

					       ring->tx_pending),

					       &ring_addr, GFP_ATOMIC);

	} else {

		rxtx_ring = pci_alloc_consistent(np->pci_dev,

					    sizeof(struct ring_desc_ex) * (ring->rx_pending + ring->tx_pending),

					    &ring_addr);

		rxtx_ring = dma_alloc_coherent(&np->pci_dev->dev,

					       sizeof(struct ring_desc_ex) *

					       (ring->rx_pending +

					       ring->tx_pending),

					       &ring_addr, GFP_ATOMIC);

	}

	rx_skbuff = kmalloc(sizeof(struct nv_skb_map) * ring->rx_pending, GFP_KERNEL);

	tx_skbuff = kmalloc(sizeof(struct nv_skb_map) * ring->tx_pending, GFP_KERNEL);
@@ -4610,11 +4620,17 @@ static int nv_set_ringparam(struct net_device *dev, struct ethtool_ringparam* ri 
		/* fall back to old rings */

		if (!nv_optimized(np)) {

			if (rxtx_ring)

				pci_free_consistent(np->pci_dev, sizeof(struct ring_desc) * (ring->rx_pending + ring->tx_pending),

				dma_free_coherent(&np->pci_dev->dev,

						  sizeof(struct ring_desc) *

						  (ring->rx_pending +

						  ring->tx_pending),

						  rxtx_ring, ring_addr);

		} else {

			if (rxtx_ring)

				pci_free_consistent(np->pci_dev, sizeof(struct ring_desc_ex) * (ring->rx_pending + ring->tx_pending),

				dma_free_coherent(&np->pci_dev->dev,

						  sizeof(struct ring_desc_ex) *

						  (ring->rx_pending +

						  ring->tx_pending),

						  rxtx_ring, ring_addr);

		}
@@ -5740,16 +5756,21 @@ static int nv_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) 
	np->tx_ring_size = TX_RING_DEFAULT;



	if (!nv_optimized(np)) {

		np->rx_ring.orig = pci_alloc_consistent(pci_dev,

					sizeof(struct ring_desc) * (np->rx_ring_size + np->tx_ring_size),

					&np->ring_addr);

		np->rx_ring.orig = dma_alloc_coherent(&pci_dev->dev,

						      sizeof(struct ring_desc) *

						      (np->rx_ring_size +

						      np->tx_ring_size),

						      &np->ring_addr,

						      GFP_ATOMIC);

		if (!np->rx_ring.orig)

			goto out_unmap;

		np->tx_ring.orig = &np->rx_ring.orig[np->rx_ring_size];

	} else {

		np->rx_ring.ex = pci_alloc_consistent(pci_dev,

					sizeof(struct ring_desc_ex) * (np->rx_ring_size + np->tx_ring_size),

					&np->ring_addr);

		np->rx_ring.ex = dma_alloc_coherent(&pci_dev->dev,

						    sizeof(struct ring_desc_ex) *

						    (np->rx_ring_size +

						    np->tx_ring_size),

						    &np->ring_addr, GFP_ATOMIC);

		if (!np->rx_ring.ex)

			goto out_unmap;

		np->tx_ring.ex = &np->rx_ring.ex[np->rx_ring_size];