| Message ID | 1606223315-13390-1-git-send-email-tangyouling@loongson.cn |
|---|---|
| State | Superseded |
| Headers | show |
| Series | i2c: busses: Use dma_set_mask_and_coherent | expand |
On Tue, Nov 24, 2020 at 09:08:35PM +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. > > Signed-off-by: Youling Tang <tangyouling@loongson.cn> Please use "i2c: ismt:", so driver maintainers know that the patch is relevant to them. > --- > drivers/i2c/busses/i2c-ismt.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c > index a35a27c..5f49830 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)) { > + if (dma_set_mask_and_coherent(pdev, DMA_BIT_MASK(64)) != 0) > + if (dma_set_mask_and_coherent(pdev, DMA_BIT_MASK(32)) != 0) { > dev_err(&pdev->dev, "pci_set_dma_mask fail %p\n", > pdev); > return -ENODEV; > } > - } > > err = ismt_dev_init(priv); > if (err) > -- > 2.1.0 >
Hi, Wolfram On 12/03/2020 12:01 AM, Wolfram Sang wrote: > On Tue, Nov 24, 2020 at 09:08:35PM +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. >> >> Signed-off-by: Youling Tang <tangyouling@loongson.cn> > Please use "i2c: ismt:", so driver maintainers know that the patch is > relevant to them. Thank you for your suggestion, I'll send v2 later. Thanks. Youling. >> --- >> drivers/i2c/busses/i2c-ismt.c | 8 ++------ >> 1 file changed, 2 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c >> index a35a27c..5f49830 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)) { >> + if (dma_set_mask_and_coherent(pdev, DMA_BIT_MASK(64)) != 0) >> + if (dma_set_mask_and_coherent(pdev, DMA_BIT_MASK(32)) != 0) { >> dev_err(&pdev->dev, "pci_set_dma_mask 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..5f49830 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)) { + if (dma_set_mask_and_coherent(pdev, DMA_BIT_MASK(64)) != 0) + if (dma_set_mask_and_coherent(pdev, DMA_BIT_MASK(32)) != 0) { dev_err(&pdev->dev, "pci_set_dma_mask 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. Signed-off-by: Youling Tang <tangyouling@loongson.cn> --- drivers/i2c/busses/i2c-ismt.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)