On Fri, Sep 17, 2021 at 7:37 PM Qing Wang <wangqing@xxxxxxxx> 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) No need to cite the script. With this addressed, Reviewed-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx> > > While at it, some 'dma_set_mask()/dma_set_coherent_mask()' have been > updated to a much less verbose 'dma_set_mask_and_coherent()'. > > This type of patches has been going on for a long time, I plan to > clean it up in the near future. If needed, see post from > Christoph Hellwig on the kernel-janitors ML: > https://marc.info/?l=kernel-janitors&m=158745678307186&w=4 > > Signed-off-by: Qing Wang <wangqing@xxxxxxxx> > --- > drivers/dma/dw/pci.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/dma/dw/pci.c b/drivers/dma/dw/pci.c > index 1142aa6..1dec1ae > --- a/drivers/dma/dw/pci.c > +++ b/drivers/dma/dw/pci.c > @@ -32,11 +32,7 @@ static int dw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pid) > pci_set_master(pdev); > pci_try_set_mwi(pdev); > > - ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); > - if (ret) > - return ret; > - > - ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); > + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); > if (ret) > return ret; > > -- > 2.7.4 > -- With Best Regards, Andy Shevchenko
