Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4db40e7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent fdc32fb3

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+5 −8
Original line number Diff line number Diff line
@@ -2201,15 +2201,12 @@ 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)) {

	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);

	if (!shost) {