Skip to content

Commit 5e14313

Browse files
shavitmichaelwilldeacon
authored andcommitted
iommu/arm-smmu-v3: Cleanup arm_smmu_domain_finalise
Remove unused master parameter now that the CD table is allocated elsewhere. Reviewed-by: Nicolin Chen <nicolinc@nvidia.com> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Michael Shavit <mshavit@google.com> Tested-by: Nicolin Chen <nicolinc@nvidia.com> Link: https://lore.kernel.org/r/20230915211705.v8.7.Iff18df41564b9df82bf40b3ec7af26b87f08ef6e@changeid Signed-off-by: Will Deacon <will@kernel.org>
1 parent 10e4968 commit 5e14313

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2077,7 +2077,6 @@ static void arm_smmu_domain_free(struct iommu_domain *domain)
20772077
}
20782078

20792079
static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain,
2080-
struct arm_smmu_master *master,
20812080
struct io_pgtable_cfg *pgtbl_cfg)
20822081
{
20832082
int ret;
@@ -2115,7 +2114,6 @@ static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain,
21152114
}
21162115

21172116
static int arm_smmu_domain_finalise_s2(struct arm_smmu_domain *smmu_domain,
2118-
struct arm_smmu_master *master,
21192117
struct io_pgtable_cfg *pgtbl_cfg)
21202118
{
21212119
int vmid;
@@ -2142,16 +2140,14 @@ static int arm_smmu_domain_finalise_s2(struct arm_smmu_domain *smmu_domain,
21422140
return 0;
21432141
}
21442142

2145-
static int arm_smmu_domain_finalise(struct iommu_domain *domain,
2146-
struct arm_smmu_master *master)
2143+
static int arm_smmu_domain_finalise(struct iommu_domain *domain)
21472144
{
21482145
int ret;
21492146
unsigned long ias, oas;
21502147
enum io_pgtable_fmt fmt;
21512148
struct io_pgtable_cfg pgtbl_cfg;
21522149
struct io_pgtable_ops *pgtbl_ops;
21532150
int (*finalise_stage_fn)(struct arm_smmu_domain *,
2154-
struct arm_smmu_master *,
21552151
struct io_pgtable_cfg *);
21562152
struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
21572153
struct arm_smmu_device *smmu = smmu_domain->smmu;
@@ -2203,7 +2199,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain,
22032199
domain->geometry.aperture_end = (1UL << pgtbl_cfg.ias) - 1;
22042200
domain->geometry.force_aperture = true;
22052201

2206-
ret = finalise_stage_fn(smmu_domain, master, &pgtbl_cfg);
2202+
ret = finalise_stage_fn(smmu_domain, &pgtbl_cfg);
22072203
if (ret < 0) {
22082204
free_io_pgtable_ops(pgtbl_ops);
22092205
return ret;
@@ -2413,7 +2409,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
24132409

24142410
if (!smmu_domain->smmu) {
24152411
smmu_domain->smmu = smmu;
2416-
ret = arm_smmu_domain_finalise(domain, master);
2412+
ret = arm_smmu_domain_finalise(domain);
24172413
if (ret)
24182414
smmu_domain->smmu = NULL;
24192415
} else if (smmu_domain->smmu != smmu)

0 commit comments

Comments
 (0)