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

Commit b359e929 authored by Sujeev Dias's avatar Sujeev Dias Committed by Gerrit - the friendly Code Review server
Browse files

mhi: controller: qcom: update iommu api to fix compile errors 



Kernel IOMMU API has been renamed, updating driver to comply
with new iommu names.

CRs-Fixed: 2313588
Change-Id: Ia1b546969165721f6eba1a03c679f57a19f6d546
Signed-off-by: default avatarSujeev Dias <sdias@codeaurora.org>
parent e20fe99a

drivers/bus/mhi/controllers/mhi_arch_qcom.c

+7 −7
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static struct dma_iommu_mapping *mhi_arch_create_iommu_mapping( 


	MHI_LOG("Create iommu mapping of base:%pad size:%zu\n",

		&base, size);

	return arm_iommu_create_mapping(&pci_bus_type, base, size);

	return __depr_arm_iommu_create_mapping(&pci_bus_type, base, size);

}



static int mhi_arch_dma_mask(struct mhi_controller *mhi_cntrl)
@@ -438,8 +438,8 @@ int mhi_arch_iommu_init(struct mhi_controller *mhi_cntrl) 
	}



	if (smmu_config) {

		ret = arm_iommu_attach_device(&mhi_dev->pci_dev->dev, mapping);



		ret = __depr_arm_iommu_attach_device(&mhi_dev->pci_dev->dev,

						     mapping);

		if (ret) {

			MHI_ERR("Error attach device, ret:%d\n", ret);

			goto release_mapping;
@@ -458,10 +458,10 @@ int mhi_arch_iommu_init(struct mhi_controller *mhi_cntrl) 
	return 0;



release_device:

	arm_iommu_detach_device(mhi_cntrl->dev);

	__depr_arm_iommu_detach_device(mhi_cntrl->dev);



release_mapping:

	arm_iommu_release_mapping(mapping);

	__depr_arm_iommu_release_mapping(mapping);



	return ret;

}
@@ -473,8 +473,8 @@ void mhi_arch_iommu_deinit(struct mhi_controller *mhi_cntrl) 
	struct dma_iommu_mapping *mapping = arch_info->mapping;



	if (mapping) {

		arm_iommu_detach_device(mhi_cntrl->dev);

		arm_iommu_release_mapping(mapping);

		__depr_arm_iommu_detach_device(mhi_cntrl->dev);

		__depr_arm_iommu_release_mapping(mapping);

	}

	arch_info->mapping = NULL;

	mhi_cntrl->dev = NULL;