scsi: isci: use dma_set_mask_and_coherent (52f603fe) · Commits · 戴 / test

The driver currently uses pci_set_dma_mask despite otherwise using the generic DMA API. Switch it over to the better generic DMA API. [mkp: s/iscsi/isci/] Signed-off-by:

Christoph Hellwig <hch@lst.de> Signed-off-by:

Martin K. Petersen <martin.petersen@oracle.com>

drivers/scsi/isci/init.c

+4 −15

Original line number	Diff line number	Diff line
		@@ -304,23 +304,12 @@ static int isci_pci_init(struct pci_dev *pdev)

		pci_set_master(pdev);

		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
		if (err) {
		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
		if (err)
		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
		return err;
		}

		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
		if (err) {
		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
		if (err)
		return err;
		}

		return 0;
		}

		static int num_controllers(struct pci_dev *pdev)
		{
		/* bar size alone can tell us if we are running with a dual controller

Admin message