Commit a0991bf4 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by David S. Miller
Browse files

net: 8139cp: switch from 'pci_' to 'dma_' API 



The wrappers in include/linux/pci-dma-compat.h should go away.

The patch has been generated with the coccinelle script below.

It has been hand modified to use 'dma_set_mask_and_coherent()' instead of
'pci_set_dma_mask()/pci_set_consistent_dma_mask()' when applicable.
This is less verbose.

It has been compile tested.

@@
@@
-    PCI_DMA_BIDIRECTIONAL
+    DMA_BIDIRECTIONAL

@@
@@
-    PCI_DMA_TODEVICE
+    DMA_TO_DEVICE

@@
@@
-    PCI_DMA_FROMDEVICE
+    DMA_FROM_DEVICE

@@
@@
-    PCI_DMA_NONE
+    DMA_NONE

@@
expression e1, e2, e3;
@@
-    pci_alloc_consistent(e1, e2, e3)
+    dma_alloc_coherent(&e1->dev, e2, e3, GFP_)

@@
expression e1, e2, e3;
@@
-    pci_zalloc_consistent(e1, e2, e3)
+    dma_alloc_coherent(&e1->dev, e2, e3, GFP_)

@@
expression e1, e2, e3, e4;
@@
-    pci_free_consistent(e1, e2, e3, e4)
+    dma_free_coherent(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_map_single(e1, e2, e3, e4)
+    dma_map_single(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_single(e1, e2, e3, e4)
+    dma_unmap_single(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4, e5;
@@
-    pci_map_page(e1, e2, e3, e4, e5)
+    dma_map_page(&e1->dev, e2, e3, e4, e5)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_page(e1, e2, e3, e4)
+    dma_unmap_page(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_map_sg(e1, e2, e3, e4)
+    dma_map_sg(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_sg(e1, e2, e3, e4)
+    dma_unmap_sg(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_single_for_cpu(e1, e2, e3, e4)
+    dma_sync_single_for_cpu(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_single_for_device(e1, e2, e3, e4)
+    dma_sync_single_for_device(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_sg_for_cpu(e1, e2, e3, e4)
+    dma_sync_sg_for_cpu(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_sg_for_device(e1, e2, e3, e4)
+    dma_sync_sg_for_device(&e1->dev, e2, e3, e4)

@@
expression e1, e2;
@@
-    pci_dma_mapping_error(e1, e2)
+    dma_mapping_error(&e1->dev, e2)

@@
expression e1, e2;
@@
-    pci_set_dma_mask(e1, e2)
+    dma_set_mask(&e1->dev, e2)

@@
expression e1, e2;
@@
-    pci_set_consistent_dma_mask(e1, e2)
+    dma_set_coherent_mask(&e1->dev, e2)

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bf7bec46

drivers/net/ethernet/realtek/8139cp.c

+12 −19
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ static int cp_rx_poll(struct napi_struct *napi, int budget) 
		}



		new_mapping = dma_map_single(&cp->pdev->dev, new_skb->data, buflen,

					 PCI_DMA_FROMDEVICE);

					 DMA_FROM_DEVICE);

		if (dma_mapping_error(&cp->pdev->dev, new_mapping)) {

			dev->stats.rx_dropped++;

			kfree_skb(new_skb);
@@ -522,7 +522,7 @@ static int cp_rx_poll(struct napi_struct *napi, int budget) 
		}



		dma_unmap_single(&cp->pdev->dev, mapping,

				 buflen, PCI_DMA_FROMDEVICE);

				 buflen, DMA_FROM_DEVICE);



		/* Handle checksum offloading for incoming packets. */

		if (cp_rx_csum_ok(status))
@@ -666,7 +666,7 @@ static void cp_tx (struct cp_private *cp) 


		dma_unmap_single(&cp->pdev->dev, le64_to_cpu(txd->addr),

				 cp->tx_opts[tx_tail] & 0xffff,

				 PCI_DMA_TODEVICE);

				 DMA_TO_DEVICE);



		if (status & LastFrag) {

			if (status & (TxError | TxFIFOUnder)) {
@@ -724,7 +724,7 @@ static void unwind_tx_frag_mapping(struct cp_private *cp, struct sk_buff *skb, 
		txd = &cp->tx_ring[index];

		this_frag = &skb_shinfo(skb)->frags[frag];

		dma_unmap_single(&cp->pdev->dev, le64_to_cpu(txd->addr),

				 skb_frag_size(this_frag), PCI_DMA_TODEVICE);

				 skb_frag_size(this_frag), DMA_TO_DEVICE);

	}

}
@@ -781,7 +781,7 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, 
		dma_addr_t mapping;



		len = skb->len;

		mapping = dma_map_single(&cp->pdev->dev, skb->data, len, PCI_DMA_TODEVICE);

		mapping = dma_map_single(&cp->pdev->dev, skb->data, len, DMA_TO_DEVICE);

		if (dma_mapping_error(&cp->pdev->dev, mapping))

			goto out_dma_error;
@@ -810,7 +810,7 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, 
		first_eor = eor;

		first_len = skb_headlen(skb);

		first_mapping = dma_map_single(&cp->pdev->dev, skb->data,

					       first_len, PCI_DMA_TODEVICE);

					       first_len, DMA_TO_DEVICE);

		if (dma_mapping_error(&cp->pdev->dev, first_mapping))

			goto out_dma_error;
@@ -826,7 +826,7 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, 
			len = skb_frag_size(this_frag);

			mapping = dma_map_single(&cp->pdev->dev,

						 skb_frag_address(this_frag),

						 len, PCI_DMA_TODEVICE);

						 len, DMA_TO_DEVICE);

			if (dma_mapping_error(&cp->pdev->dev, mapping)) {

				unwind_tx_frag_mapping(cp, skb, first_entry, entry);

				goto out_dma_error;
@@ -1069,7 +1069,7 @@ static int cp_refill_rx(struct cp_private *cp) 
			goto err_out;



		mapping = dma_map_single(&cp->pdev->dev, skb->data,

					 cp->rx_buf_sz, PCI_DMA_FROMDEVICE);

					 cp->rx_buf_sz, DMA_FROM_DEVICE);

		if (dma_mapping_error(&cp->pdev->dev, mapping)) {

			kfree_skb(skb);

			goto err_out;
@@ -1139,7 +1139,7 @@ static void cp_clean_rings (struct cp_private *cp) 
		if (cp->rx_skb[i]) {

			desc = cp->rx_ring + i;

			dma_unmap_single(&cp->pdev->dev,le64_to_cpu(desc->addr),

					 cp->rx_buf_sz, PCI_DMA_FROMDEVICE);

					 cp->rx_buf_sz, DMA_FROM_DEVICE);

			dev_kfree_skb_any(cp->rx_skb[i]);

		}

	}
@@ -1151,7 +1151,7 @@ static void cp_clean_rings (struct cp_private *cp) 
			desc = cp->tx_ring + i;

			dma_unmap_single(&cp->pdev->dev,le64_to_cpu(desc->addr),

					 le32_to_cpu(desc->opts1) & 0xffff,

					 PCI_DMA_TODEVICE);

					 DMA_TO_DEVICE);

			if (le32_to_cpu(desc->opts1) & LastFrag)

				dev_kfree_skb_any(skb);

			cp->dev->stats.tx_dropped++;
@@ -1945,24 +1945,17 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* Configure DMA attributes. */

	if ((sizeof(dma_addr_t) > 4) &&

	    !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)) &&

	    !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {

	    !dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64))) {

		pci_using_dac = 1;

	} else {

		pci_using_dac = 0;



		rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));

		rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

		if (rc) {

			dev_err(&pdev->dev,

				"No usable DMA configuration, aborting\n");

			goto err_out_res;

		}

		rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

		if (rc) {

			dev_err(&pdev->dev,

				"No usable consistent DMA configuration, aborting\n");

			goto err_out_res;

		}

	}



	cp->cpcmd = (pci_using_dac ? PCIDAC : 0) |