From nobody Wed Jul 1 04:19:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B63D1C433F5 for ; Sun, 2 Jan 2022 15:33:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233265AbiABPdJ (ORCPT ); Sun, 2 Jan 2022 10:33:09 -0500 Received: from smtp03.smtpout.orange.fr ([80.12.242.125]:64354 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232269AbiABPdI (ORCPT ); Sun, 2 Jan 2022 10:33:08 -0500 Received: from pop-os.home ([86.243.171.122]) by smtp.orange.fr with ESMTPA id 42qyndeMqIEdl42qyn5k1V; Sun, 02 Jan 2022 16:33:05 +0100 X-ME-Helo: pop-os.home X-ME-Auth: YWZlNiIxYWMyZDliZWIzOTcwYTEyYzlhMmU3ZiQ1M2U2MzfzZDfyZTMxZTBkMTYyNDBjNDJlZmQ3ZQ== X-ME-Date: Sun, 02 Jan 2022 16:33:05 +0100 X-ME-IP: 86.243.171.122 From: Christophe JAILLET To: rth@twiddle.net, ink@jurassic.park.msu.ru, mattst88@gmail.com, logang@deltatee.com, akpm@linux-foundation.org, rppt@kernel.org, david@redhat.com, arnd@arndb.de, martin.oliveira@eideticom.com Cc: linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH] alpha: Remove usage of the deprecated "pci-dma-compat.h" API Date: Sun, 2 Jan 2022 16:32:59 +0100 Message-Id: <0b8bacb36e111d2621c2c0459b20b1da9f4375c0.1641137463.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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. @@ @@ - 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, 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; @@ - pci_unmap_sg(e1, e2, e3, e4) + dma_unmap_sg(&e1->dev, e2, e3, e4) [1]: https://lore.kernel.org/kernel-janitors/20200421081257.GA131897@infrad= ead.org/ [2]: https://lore.kernel.org/kernel-janitors/alpine.DEB.2.22.394.2007120902= 170.2424@hadrien/ Signed-off-by: Christophe JAILLET Reviewed-by: Arnd Bergmann --- arch/alpha/include/asm/floppy.h | 7 ++++--- arch/alpha/kernel/pci_iommu.c | 12 ++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/alpha/include/asm/floppy.h b/arch/alpha/include/asm/flopp= y.h index 8dfdb3aa1d96..588758685439 100644 --- a/arch/alpha/include/asm/floppy.h +++ b/arch/alpha/include/asm/floppy.h @@ -43,17 +43,18 @@ alpha_fd_dma_setup(char *addr, unsigned long size, int = mode, int io) static int prev_dir; int dir; =20 - dir =3D (mode !=3D DMA_MODE_READ) ? PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE; + dir =3D (mode !=3D DMA_MODE_READ) ? DMA_FROM_DEVICE : DMA_TO_DEVICE; =20 if (bus_addr=20 && (addr !=3D prev_addr || size !=3D prev_size || dir !=3D prev_dir))= { /* different from last time -- unmap prev */ - pci_unmap_single(isa_bridge, bus_addr, prev_size, prev_dir); + dma_unmap_single(&isa_bridge->dev, bus_addr, prev_size, + prev_dir); bus_addr =3D 0; } =20 if (!bus_addr) /* need to map it */ - bus_addr =3D pci_map_single(isa_bridge, addr, size, dir); + bus_addr =3D dma_map_single(&isa_bridge->dev, addr, size, dir); =20 /* remember this one as prev */ prev_addr =3D addr; diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index 21f9ac101324..e83a02ed5267 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c @@ -333,7 +333,7 @@ static dma_addr_t alpha_pci_map_page(struct device *dev= , struct page *page, struct pci_dev *pdev =3D alpha_gendev_to_pci(dev); int dac_allowed; =20 - BUG_ON(dir =3D=3D PCI_DMA_NONE); + BUG_ON(dir =3D=3D DMA_NONE); =20 dac_allowed =3D pdev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0;=20 return pci_map_single_1(pdev, (char *)page_address(page) + offset,=20 @@ -356,7 +356,7 @@ static void alpha_pci_unmap_page(struct device *dev, dm= a_addr_t dma_addr, struct pci_iommu_arena *arena; long dma_ofs, npages; =20 - BUG_ON(dir =3D=3D PCI_DMA_NONE); + BUG_ON(dir =3D=3D DMA_NONE); =20 if (dma_addr >=3D __direct_map_base && dma_addr < __direct_map_base + __direct_map_size) { @@ -460,7 +460,7 @@ static void alpha_pci_free_coherent(struct device *dev,= size_t size, unsigned long attrs) { struct pci_dev *pdev =3D alpha_gendev_to_pci(dev); - pci_unmap_single(pdev, dma_addr, size, PCI_DMA_BIDIRECTIONAL); + dma_unmap_single(&pdev->dev, dma_addr, size, DMA_BIDIRECTIONAL); free_pages((unsigned long)cpu_addr, get_order(size)); =20 DBGA2("pci_free_consistent: [%llx,%zx] from %ps\n", @@ -639,7 +639,7 @@ static int alpha_pci_map_sg(struct device *dev, struct = scatterlist *sg, dma_addr_t max_dma; int dac_allowed; =20 - BUG_ON(dir =3D=3D PCI_DMA_NONE); + BUG_ON(dir =3D=3D DMA_NONE); =20 dac_allowed =3D dev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0; =20 @@ -702,7 +702,7 @@ static int alpha_pci_map_sg(struct device *dev, struct = scatterlist *sg, /* Some allocation failed while mapping the scatterlist entries. Unmap them now. */ if (out > start) - pci_unmap_sg(pdev, start, out - start, dir); + dma_unmap_sg(&pdev->dev, start, out - start, dir); return -ENOMEM; } =20 @@ -722,7 +722,7 @@ static void alpha_pci_unmap_sg(struct device *dev, stru= ct scatterlist *sg, dma_addr_t max_dma; dma_addr_t fbeg, fend; =20 - BUG_ON(dir =3D=3D PCI_DMA_NONE); + BUG_ON(dir =3D=3D DMA_NONE); =20 if (! alpha_mv.mv_pci_tbi) return; --=20 2.32.0