Merge "iommu: arm-smmu: Remove unnecessary power_on call" (cb4ceca2) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/iommu/arm-smmu.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -2405,10 +2405,6 @@ static size_t arm_smmu_map_sg(struct iommu_domain *domain, unsigned long iova,
		if (!ops)
		return -ENODEV;

		ret = arm_smmu_domain_power_on(domain, smmu_domain->smmu);
		if (ret)
		return ret;

		arm_smmu_secure_domain_lock(smmu_domain);

		__saved_iova_start = iova;
		@@ -2449,7 +2445,6 @@ static size_t arm_smmu_map_sg(struct iommu_domain *domain, unsigned long iova,
		iova = __saved_iova_start;
		}
		arm_smmu_secure_domain_unlock(smmu_domain);
		arm_smmu_domain_power_off(domain, smmu_domain->smmu);
		return iova - __saved_iova_start;
		}