* [PATCH V2] i2c: busses: switch from 'pci_' to 'dma_' API
@ 2021-09-28 3:41 Qing Wang
2021-10-02 7:51 ` Wolfram Sang
0 siblings, 1 reply; 2+ messages in thread
From: Qing Wang @ 2021-09-28 3:41 UTC (permalink / raw)
To: Seth Heasley, Neil Horman, linux-i2c, linux-kernel; +Cc: Qing Wang
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(-)
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;
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH V2] i2c: busses: switch from 'pci_' to 'dma_' API
2021-09-28 3:41 [PATCH V2] i2c: busses: switch from 'pci_' to 'dma_' API Qing Wang
@ 2021-10-02 7:51 ` Wolfram Sang
0 siblings, 0 replies; 2+ messages in thread
From: Wolfram Sang @ 2021-10-02 7:51 UTC (permalink / raw)
To: Qing Wang; +Cc: Seth Heasley, Neil Horman, linux-i2c, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 864 bytes --]
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!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-02 7:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-28 3:41 [PATCH V2] i2c: busses: switch from 'pci_' to 'dma_' API Qing Wang
2021-10-02 7:51 ` Wolfram Sang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.