Skip to content

Commit

Permalink
iommu/arm-smmu-v3: Remove unnecessary wrapper function
Browse files Browse the repository at this point in the history
Simplify the code by removing an unnecessary wrapper function.

This was left behind by commit 2f657ad
("iommu/arm-smmu-v3: Specialise CMD_SYNC handling")

Signed-off-by: Andrew Murray <andrew.murray@arm.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
  • Loading branch information
Andrew Murray authored and Joerg Roedel committed Oct 10, 2018
1 parent 2d7ca2c commit 5e73107
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions drivers/iommu/arm-smmu-v3.c
Original file line number Diff line number Diff line change
Expand Up @@ -1371,15 +1371,11 @@ static irqreturn_t arm_smmu_combined_irq_handler(int irq, void *dev)
}

/* IO_PGTABLE API */
static void __arm_smmu_tlb_sync(struct arm_smmu_device *smmu)
{
arm_smmu_cmdq_issue_sync(smmu);
}

static void arm_smmu_tlb_sync(void *cookie)
{
struct arm_smmu_domain *smmu_domain = cookie;
__arm_smmu_tlb_sync(smmu_domain->smmu);

arm_smmu_cmdq_issue_sync(smmu_domain->smmu);
}

static void arm_smmu_tlb_inv_context(void *cookie)
Expand All @@ -1404,7 +1400,7 @@ static void arm_smmu_tlb_inv_context(void *cookie)
* to guarantee those are observed before the TLBI. Do be careful, 007.
*/
arm_smmu_cmdq_issue_cmd(smmu, &cmd);
__arm_smmu_tlb_sync(smmu);
arm_smmu_cmdq_issue_sync(smmu);
}

static void arm_smmu_tlb_inv_range_nosync(unsigned long iova, size_t size,
Expand Down Expand Up @@ -1793,7 +1789,7 @@ static void arm_smmu_iotlb_sync(struct iommu_domain *domain)
struct arm_smmu_device *smmu = to_smmu_domain(domain)->smmu;

if (smmu)
__arm_smmu_tlb_sync(smmu);
arm_smmu_cmdq_issue_sync(smmu);
}

static phys_addr_t
Expand Down

0 comments on commit 5e73107

Please sign in to comment.