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

Commit 052d0efa authored by Russell King's avatar Russell King
Browse files

DMA-API: block: nvme-core: replace dma_set_mask()+dma_set_coherent_mask() with new helper 



Replace the following sequence:

	dma_set_mask(dev, mask);
	dma_set_coherent_mask(dev, mask);

with a call to the new helper dma_set_mask_and_coherent().

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4886c399

drivers/block/nvme-core.c

+4 −6
Original line number Diff line number Diff line
@@ -1949,12 +1949,9 @@ static int nvme_dev_map(struct nvme_dev *dev) 
	if (pci_request_selected_regions(pdev, bars, "nvme"))

		goto disable_pci;



	if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)))

		dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));

	else if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)))

		dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));

	else

		goto disable_pci;

	if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) &&

	    dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))

		goto disable;



	pci_set_drvdata(pdev, dev);

	dev->bar = ioremap(pci_resource_start(pdev, 0), 8192);
@@ -2168,6 +2165,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	INIT_LIST_HEAD(&dev->namespaces);

	dev->pci_dev = pdev;



	result = nvme_set_instance(dev);

	if (result)

		goto free;