| Message ID | 1632800519-108430-1-git-send-email-wangqing@vivo.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [V2] i2c: busses: switch from 'pci_' to 'dma_' API | expand |
On Mon, Sep 27, 2021 at 08:41:56PM -0700, Qing Wang wrote: > 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()'. > > Signed-off-by: Qing Wang <wangqing@vivo.com> I applied this one instead http://patchwork.ozlabs.org/project/linux-i2c/patch/fad542b558afc45496f7a7ba581593cd46e68f7c.1629660967.git.christophe.jaillet@wanadoo.fr/ because it was earlier and more complete. Still, thank you for the effort!
diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c index a6187cb..b497558 --- a/drivers/i2c/busses/i2c-ismt.c +++ b/drivers/i2c/busses/i2c-ismt.c @@ -918,11 +918,8 @@ ismt_probe(struct pci_dev *pdev, const struct pci_device_id *id) return -ENODEV; } - if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) != 0) || - (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)) != 0)) { - if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) != 0) || - (pci_set_consistent_dma_mask(pdev, - DMA_BIT_MASK(32)) != 0)) { + if ((dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) != 0) { + if ((dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)) != 0) { dev_err(&pdev->dev, "pci_set_dma_mask fail %p\n", pdev); return -ENODEV;
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()'. Signed-off-by: Qing Wang <wangqing@vivo.com> --- drivers/i2c/busses/i2c-ismt.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)