Commit df0e4de2 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Jason Gunthorpe
Browse files

IB/qib: Use dma_set_mask_and_coherent to simplify code 

'pci_set_dma_mask()' + 'pci_set_consistent_dma_mask()' can be replaced by
an equivalent 'dma_set_mask_and_coherent()' which is much less verbose.

Link: https://lore.kernel.org/r/20201121095127.1335228-1-christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarMike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 82101630

drivers/infiniband/hw/qib/qib_pcie.c

+2 −9
Original line number Diff line number Diff line
@@ -90,25 +90,18 @@ int qib_pcie_init(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto bail;

	}



	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));

	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (ret) {

		/*

		 * If the 64 bit setup fails, try 32 bit.  Some systems

		 * do not setup 64 bit maps on systems with 2GB or less

		 * memory installed.

		 */

		ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));

		ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

		if (ret) {

			qib_devinfo(pdev, "Unable to set DMA mask: %d\n", ret);

			goto bail;

		}

		ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

	} else

		ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));

	if (ret) {

		qib_early_err(&pdev->dev,

			      "Unable to set DMA consistent mask: %d\n", ret);

		goto bail;

	}



	pci_set_master(pdev);