* [PATCH v3] i2c: ismt: Use dma_set_mask_and_coherent
@ 2020-12-03 6:50 Youling Tang
2021-01-22 9:07 ` Wolfram Sang
0 siblings, 1 reply; 2+ messages in thread
From: Youling Tang @ 2020-12-03 6:50 UTC (permalink / raw)
To: Seth Heasley, Neil Horman; +Cc: Wolfram Sang, linux-i2c, linux-kernel
'pci_set_dma_mask()' + 'pci_set_consistent_dma_mask()' can be replaced by
an equivalent 'dma_set_mask_and_coherent()' which is much less verbose.
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Youling Tang <tangyouling@loongson.cn>
---
v3: Fix build errors of incompatible pointer types.
drivers/i2c/busses/i2c-ismt.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c
index a35a27c..88f6039 100644
--- a/drivers/i2c/busses/i2c-ismt.c
+++ b/drivers/i2c/busses/i2c-ismt.c
@@ -903,16 +903,12 @@ 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)) {
- dev_err(&pdev->dev, "pci_set_dma_mask fail %p\n",
+ 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, "dma_set_mask_and_coherent fail %p\n",
pdev);
return -ENODEV;
}
- }
err = ismt_dev_init(priv);
if (err)
--
2.1.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v3] i2c: ismt: Use dma_set_mask_and_coherent
2020-12-03 6:50 [PATCH v3] i2c: ismt: Use dma_set_mask_and_coherent Youling Tang
@ 2021-01-22 9:07 ` Wolfram Sang
0 siblings, 0 replies; 2+ messages in thread
From: Wolfram Sang @ 2021-01-22 9:07 UTC (permalink / raw)
To: Youling Tang; +Cc: Seth Heasley, Neil Horman, linux-i2c, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1527 bytes --]
On Thu, Dec 03, 2020 at 02:50:52PM +0800, Youling Tang wrote:
> 'pci_set_dma_mask()' + 'pci_set_consistent_dma_mask()' can be replaced by
> an equivalent 'dma_set_mask_and_coherent()' which is much less verbose.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Youling Tang <tangyouling@loongson.cn>
Seth, Neil, are you OK with this patch?
> ---
>
> v3: Fix build errors of incompatible pointer types.
>
> drivers/i2c/busses/i2c-ismt.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c
> index a35a27c..88f6039 100644
> --- a/drivers/i2c/busses/i2c-ismt.c
> +++ b/drivers/i2c/busses/i2c-ismt.c
> @@ -903,16 +903,12 @@ 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)) {
> - dev_err(&pdev->dev, "pci_set_dma_mask fail %p\n",
> + 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, "dma_set_mask_and_coherent fail %p\n",
> pdev);
> return -ENODEV;
> }
> - }
>
> err = ismt_dev_init(priv);
> if (err)
> --
> 2.1.0
>
[-- 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-01-22 12:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-03 6:50 [PATCH v3] i2c: ismt: Use dma_set_mask_and_coherent Youling Tang
2021-01-22 9:07 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).