diff options
| author | Mitchel Humpherys <mitchelh@codeaurora.org> | 2015-06-15 15:29:07 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:13:04 -0700 |
| commit | 636df566d2c6bc4bdf075e3e6f0813a93eead0b7 (patch) | |
| tree | 5a5b10c2424d468d1768a92f118c2724f2073ca3 | |
| parent | 72da3d84eb8461294fcb04f8a3c2220ea2bf6da6 (diff) | |
iommu/arm-smmu: Remove domain lock variable
The `lock' field of struct arm_smmu_domain was replaced by `init_mutex'
in 9725ec12d27e215 (iommu/arm-smmu: re-use the init_mutex for protecting
smmu_domain.smmu), but the `lock' field itself was not deleted. It's
not meant to be used anymore, so delete it. Some usages of the crufty
lock have also crept up, so fix those as well.
Change-Id: I33c2f83e7b15f0ec2cb08c784a84991a7c57950f
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index b2dd7ab6ba1e..2d07fd1536e9 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -420,7 +420,6 @@ struct arm_smmu_domain { spinlock_t pgtbl_lock; struct arm_smmu_cfg cfg; enum arm_smmu_domain_stage stage; - struct mutex lock; struct mutex init_mutex; /* Protects smmu pointer */ u32 attributes; u32 secure_vmid; @@ -1363,7 +1362,6 @@ static int arm_smmu_domain_init(struct iommu_domain *domain) smmu_domain->secure_vmid = VMID_INVAL; INIT_LIST_HEAD(&smmu_domain->pte_info_list); - mutex_init(&smmu_domain->lock); mutex_init(&smmu_domain->init_mutex); spin_lock_init(&smmu_domain->pgtbl_lock); domain->priv = smmu_domain; @@ -2005,17 +2003,17 @@ static int arm_smmu_dma_supported(struct iommu_domain *domain, struct arm_smmu_domain *smmu_domain = domain->priv; int ret; - mutex_lock(&smmu_domain->lock); + mutex_lock(&smmu_domain->init_mutex); smmu = smmu_domain->smmu; if (!smmu) { dev_err(dev, "Can't call dma_supported on an unattached domain\n"); - mutex_unlock(&smmu_domain->lock); + mutex_unlock(&smmu_domain->init_mutex); return 0; } ret = ((1ULL << smmu->va_size) - 1) <= mask ? 0 : 1; - mutex_unlock(&smmu_domain->lock); + mutex_unlock(&smmu_domain->init_mutex); return ret; } |