bus: mhi: pci_generic: Simplify code and axe the use of a deprecated API

The wrappers in include/linux/pci-dma-compat.h should go away.

Replace 'pci_set_dma_mask/pci_set_consistent_dma_mask' by an equivalent
and less verbose 'dma_set_mask_and_coherent()' call.

Link: https://lore.kernel.org/r/bb3dc436fe142309a2334549db782c5ebb80a2be.1625718497.git.christophe.jaillet@wanadoo.fr
Reviewed-by: Hemant Kumar <hemantk@codeaurora.org>
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20211216081227.237749-6-manivannan.sadhasivam@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/bus/mhi/pci_generic.c b/drivers/bus/mhi/pci_generic.c
index 1ffd78113e47fc1a3ec5faaf43b49fc8105745d3..759df02fb0bea30f955e24194e7721a9f54a82dc 100644 (file)
--- a/drivers/bus/mhi/pci_generic.c
+++ b/drivers/bus/mhi/pci_generic.c
@@ -532,18 +532,12 @@ static int mhi_pci_claim(struct mhi_controller *mhi_cntrl,
        mhi_cntrl->regs = pcim_iomap_table(pdev)[bar_num];
        mhi_cntrl->reg_len = pci_resource_len(pdev, bar_num);
 
-       err = pci_set_dma_mask(pdev, dma_mask);
+       err = dma_set_mask_and_coherent(&pdev->dev, dma_mask);
        if (err) {
                dev_err(&pdev->dev, "Cannot set proper DMA mask\n");
                return err;
        }
 
-       err = pci_set_consistent_dma_mask(pdev, dma_mask);
-       if (err) {
-               dev_err(&pdev->dev, "set consistent dma mask failed\n");
-               return err;
-       }
-
        pci_set_master(pdev);
 
        return 0;