From b13b308aa1c46d996561da45ba9baea82e45f94a Mon Sep 17 00:00:00 2001

From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Date: Sat, 18 Sep 2021 07:36:42 +0200

Subject: mei: Remove usage of the deprecated "pci-dma-compat.h" API

Git-commit: 54fa156bb33ad06077ec709dc2331a4d5ee446f3

Patch-mainline: v5.16-rc1

References: jsc#PED-1218

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].

Finally, Arnd Bergmann reminded that the documentation was updated 11 years

ago to only describe the modern linux/dma-mapping.h interfaces and mark the

old bus-specific ones as no longer recommended, see commit 216bf58f4092

("Documentation: convert PCI-DMA-mapping.txt to use the generic DMA API").

A coccinelle script has been used to perform the needed transformation

Only relevant parts are given below.

@@

expression e1, e2;

@@

-    pci_set_dma_mask(e1, e2)

+    dma_set_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/

Reviewed-by: Arnd Bergmann <arnd@arndb.de>

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Link: https://lore.kernel.org/r/c6f280927835c5677cc0367fccdc0ef54b307bd8.1631943364.git.christophe.jaillet@wanadoo.fr

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Acked-by: Patrik Jakobsson <pjakobsson@suse.de>

---

 drivers/misc/mei/pci-txe.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/mei/pci-txe.c b/drivers/misc/mei/pci-txe.c

index aec0483b8e72..fa20d9a27813 100644

--- a/drivers/misc/mei/pci-txe.c

+++ b/drivers/misc/mei/pci-txe.c

@@ -69,9 +69,9 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

 		goto end;

 	}

-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));

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

 	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 suitable DMA available.\n");

 			goto end;

-- 

2.39.0