RDMA/efa: Use dma_set_mask_and_coherent() to simplify code

Use dma_set_mask_and_coherent() instead of pci_set_dma_mask() followed by
a pci_set_consistent_dma_mask().

Link: https://lore.kernel.org/r/20201201091811.37984-1-galpress@amazon.com
Reviewed-by: Firas JahJah <firasj@amazon.com>
Reviewed-by: Yossi Leybovich <sleybo@amazon.com>
Signed-off-by: Gal Pressman <galpress@amazon.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/hw/efa/efa_main.c b/drivers/infiniband/hw/efa/efa_main.c
index cb2f2c647ee5653db4ca6d76ebe939f1e1f4e7cd..0f578734bddb60e34041c63081927ab9a388ba31 100644 (file)
--- a/drivers/infiniband/hw/efa/efa_main.c
+++ b/drivers/infiniband/hw/efa/efa_main.c
@@ -384,19 +384,12 @@ static int efa_device_init(struct efa_com_dev *edev, struct pci_dev *pdev)
                return err;
        }
 
-       err = pci_set_dma_mask(pdev, DMA_BIT_MASK(dma_width));
+       err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(dma_width));
        if (err) {
-               dev_err(&pdev->dev, "pci_set_dma_mask failed %d\n", err);
+               dev_err(&pdev->dev, "dma_set_mask_and_coherent failed %d\n", err);
                return err;
        }
 
-       err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(dma_width));
-       if (err) {
-               dev_err(&pdev->dev,
-                       "err_pci_set_consistent_dma_mask failed %d\n",
-                       err);
-               return err;
-       }
        dma_set_max_seg_size(&pdev->dev, UINT_MAX);
        return 0;
 }