Commit f3d13397 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

bus: mhi: pci_generic: Simplify code and axe the use of a deprecated API 

The wrappers in include/linux/pci-dma-compat.h should go away.

Replace 'pci_set_dma_mask/pci_set_consistent_dma_mask' by an equivalent
and less verbose 'dma_set_mask_and_coherent()' call.

Link: https://lore.kernel.org/r/bb3dc436fe142309a2334549db782c5ebb80a2be.1625718497.git.christophe.jaillet@wanadoo.fr


Reviewed-by: default avatarHemant Kumar <hemantk@codeaurora.org>
Reviewed-by: default avatarManivannan Sadhasivam <mani@kernel.org>
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20211216081227.237749-6-manivannan.sadhasivam@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 85ec6094

drivers/bus/mhi/pci_generic.c

+1 −7
Original line number Diff line number Diff line
@@ -532,18 +532,12 @@ static int mhi_pci_claim(struct mhi_controller *mhi_cntrl, 
	mhi_cntrl->regs = pcim_iomap_table(pdev)[bar_num];

	mhi_cntrl->reg_len = pci_resource_len(pdev, bar_num);



	err = pci_set_dma_mask(pdev, dma_mask);

	err = dma_set_mask_and_coherent(&pdev->dev, dma_mask);

	if (err) {

		dev_err(&pdev->dev, "Cannot set proper DMA mask\n");

		return err;

	}



	err = pci_set_consistent_dma_mask(pdev, dma_mask);

	if (err) {

		dev_err(&pdev->dev, "set consistent dma mask failed\n");

		return err;

	}



	pci_set_master(pdev);



	return 0;