Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

agp/intel: Remove usage of the deprecated "pci-dma-compat.h" 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.
It can be found in [3].

[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/
[3]: https://lore.kernel.org/kernel-janitors/20200716192821.321233-1-christophe.jaillet@wanadoo.fr/

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>

authored by

Christophe JAILLET and committed by
Christoph Hellwig
ffecba83 06cc5cf1

+13 -13
+13 -13
drivers/char/agp/intel-gtt.c
··· 111 111 for_each_sg(st->sgl, sg, num_entries, i) 112 112 sg_set_page(sg, pages[i], PAGE_SIZE, 0); 113 113 114 - if (!pci_map_sg(intel_private.pcidev, 115 - st->sgl, st->nents, PCI_DMA_BIDIRECTIONAL)) 114 + if (!dma_map_sg(&intel_private.pcidev->dev, st->sgl, st->nents, 115 + DMA_BIDIRECTIONAL)) 116 116 goto err; 117 117 118 118 return 0; ··· 127 127 struct sg_table st; 128 128 DBG("try unmapping %lu pages\n", (unsigned long)mem->page_count); 129 129 130 - pci_unmap_sg(intel_private.pcidev, sg_list, 131 - num_sg, PCI_DMA_BIDIRECTIONAL); 130 + dma_unmap_sg(&intel_private.pcidev->dev, sg_list, num_sg, 131 + DMA_BIDIRECTIONAL); 132 132 133 133 st.sgl = sg_list; 134 134 st.orig_nents = st.nents = num_sg; ··· 303 303 set_pages_uc(page, 1); 304 304 305 305 if (intel_private.needs_dmar) { 306 - dma_addr = pci_map_page(intel_private.pcidev, page, 0, 307 - PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); 308 - if (pci_dma_mapping_error(intel_private.pcidev, dma_addr)) { 306 + dma_addr = dma_map_page(&intel_private.pcidev->dev, page, 0, 307 + PAGE_SIZE, DMA_BIDIRECTIONAL); 308 + if (dma_mapping_error(&intel_private.pcidev->dev, dma_addr)) { 309 309 __free_page(page); 310 310 return -EINVAL; 311 311 } ··· 552 552 { 553 553 set_pages_wb(intel_private.scratch_page, 1); 554 554 if (intel_private.needs_dmar) 555 - pci_unmap_page(intel_private.pcidev, 556 - intel_private.scratch_page_dma, 557 - PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); 555 + dma_unmap_page(&intel_private.pcidev->dev, 556 + intel_private.scratch_page_dma, PAGE_SIZE, 557 + DMA_BIDIRECTIONAL); 558 558 __free_page(intel_private.scratch_page); 559 559 } 560 560 ··· 1412 1412 1413 1413 if (bridge) { 1414 1414 mask = intel_private.driver->dma_mask_size; 1415 - if (pci_set_dma_mask(intel_private.pcidev, DMA_BIT_MASK(mask))) 1415 + if (dma_set_mask(&intel_private.pcidev->dev, DMA_BIT_MASK(mask))) 1416 1416 dev_err(&intel_private.pcidev->dev, 1417 1417 "set gfx device dma mask %d-bit failed!\n", 1418 1418 mask); 1419 1419 else 1420 - pci_set_consistent_dma_mask(intel_private.pcidev, 1421 - DMA_BIT_MASK(mask)); 1420 + dma_set_coherent_mask(&intel_private.pcidev->dev, 1421 + DMA_BIT_MASK(mask)); 1422 1422 } 1423 1423 1424 1424 if (intel_gtt_init() != 0) {