scsi: hisi_sas: use dma_set_mask_and_coherent

The driver currently uses pci_set_dma_mask despite otherwise using the
generic DMA API.  Switch it over to the better generic DMA API.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index bd4ce38b98d229ad56fb4a224621929b34d11640..73bf45e52a0aab1517eccc715d462d90f6e71e92 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -2201,14 +2201,11 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        if (rc)
                goto err_out_disable_device;
 
-       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(dev, "No usable DMA addressing method\n");
-                       rc = -EIO;
-                       goto err_out_regions;
-               }
+       if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) ||
+           dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) {
+               dev_err(dev, "No usable DMA addressing method\n");
+               rc = -EIO;
+               goto err_out_regions;
        }
 
        shost = hisi_sas_shost_alloc_pci(pdev);