| Message ID | 1606978252-26169-1-git-send-email-tangyouling@loongson.cn |
|---|---|
| State | New |
| Headers | show |
| Series | [v3] i2c: ismt: Use dma_set_mask_and_coherent | expand |
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 >
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)
'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(-)