The wrappers in include/linux/pci-dma-compat.h should go away. The patch has been generated with the coccinelle script below. 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) While at it, some 'dma_set_mask()/dma_set_coherent_mask()' have been updated to a much less verbose 'dma_set_mask_and_coherent()'. This type of patches has been going on for a long time, I plan to clean it up in the near future. If needed, see post from Christoph Hellwig on the kernel-janitors ML: https://marc.info/?l=kernel-janitors&m=158745678307186&w=4 Qing Wang (7): dma: dw-edma-pcie: switch from 'pci_' to 'dma_' API dma: dw: switch from 'pci_' to 'dma_' API dma: hisi_dma: switch from 'pci_' to 'dma_' API dma: hsu: switch from 'pci_' to 'dma_' API dma: ioat: switch from 'pci_' to 'dma_' API dma: dmaengine: switch from 'pci_' to 'dma_' API message: fusion: switch from 'pci_' to 'dma_' API drivers/dma/dw-edma/dw-edma-pcie.c | 17 ++++------------- drivers/dma/dw/pci.c | 6 +----- drivers/dma/hisi_dma.c | 6 +----- drivers/dma/hsu/pci.c | 6 +----- drivers/dma/ioat/init.c | 10 ++-------- drivers/dma/plx_dma.c | 10 ++-------- drivers/message/fusion/mptbase.c | 31 +++++++++---------------------- 7 files changed, 20 insertions(+), 66 deletions(-) -- 2.7.4
