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

niu: switch from 'pci_' to 'dma_' API 

In [1], Christoph Hellwig has proposed to remove the wrappers in
include/linux/pci-dma-compat.h.

Some reasons why this API should be removed have been given by Julia
Lawall in [2].

A coccinelle script has been used to perform the needed transformation
Only relevant parts are given 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.

Finally, the now useless 'dma_mask' variable has been removed.

It has been compile tested.

@@
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)

[1]: https://lore.kernel.org/kernel-janitors/20200421081257.GA131897@infradead.org/
[2]: https://lore.kernel.org/kernel-janitors/alpine.DEB.2.22.394.2007120902170.2424@hadrien/



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

drivers/net/ethernet/sun/niu.c

+3 −11
Original line number Diff line number Diff line
@@ -9722,7 +9722,6 @@ static int niu_pci_init_one(struct pci_dev *pdev, 
	struct net_device *dev;

	struct niu *np;

	int err;

	u64 dma_mask;



	niu_driver_version();
@@ -9777,18 +9776,11 @@ static int niu_pci_init_one(struct pci_dev *pdev, 
		PCI_EXP_DEVCTL_FERE | PCI_EXP_DEVCTL_URRE |

		PCI_EXP_DEVCTL_RELAX_EN);



	dma_mask = DMA_BIT_MASK(44);

	err = pci_set_dma_mask(pdev, dma_mask);

	if (!err) {

	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(44));

	if (!err)

		dev->features |= NETIF_F_HIGHDMA;

		err = pci_set_consistent_dma_mask(pdev, dma_mask);

		if (err) {

			dev_err(&pdev->dev, "Unable to obtain 44 bit DMA for consistent allocations, aborting\n");

			goto err_out_release_parent;

		}

	}

	if (err) {

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

		err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));

		if (err) {

			dev_err(&pdev->dev, "No usable DMA configuration, aborting\n");

			goto err_out_release_parent;