@@ -2077,7 +2077,6 @@ static void arm_smmu_domain_free(struct iommu_domain *domain)
2077
2077
}
2078
2078
2079
2079
static int arm_smmu_domain_finalise_s1 (struct arm_smmu_domain * smmu_domain ,
2080
- struct arm_smmu_master * master ,
2081
2080
struct io_pgtable_cfg * pgtbl_cfg )
2082
2081
{
2083
2082
int ret ;
@@ -2115,7 +2114,6 @@ static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain,
2115
2114
}
2116
2115
2117
2116
static int arm_smmu_domain_finalise_s2 (struct arm_smmu_domain * smmu_domain ,
2118
- struct arm_smmu_master * master ,
2119
2117
struct io_pgtable_cfg * pgtbl_cfg )
2120
2118
{
2121
2119
int vmid ;
@@ -2142,16 +2140,14 @@ static int arm_smmu_domain_finalise_s2(struct arm_smmu_domain *smmu_domain,
2142
2140
return 0 ;
2143
2141
}
2144
2142
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 )
2147
2144
{
2148
2145
int ret ;
2149
2146
unsigned long ias , oas ;
2150
2147
enum io_pgtable_fmt fmt ;
2151
2148
struct io_pgtable_cfg pgtbl_cfg ;
2152
2149
struct io_pgtable_ops * pgtbl_ops ;
2153
2150
int (* finalise_stage_fn )(struct arm_smmu_domain * ,
2154
- struct arm_smmu_master * ,
2155
2151
struct io_pgtable_cfg * );
2156
2152
struct arm_smmu_domain * smmu_domain = to_smmu_domain (domain );
2157
2153
struct arm_smmu_device * smmu = smmu_domain -> smmu ;
@@ -2203,7 +2199,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain,
2203
2199
domain -> geometry .aperture_end = (1UL << pgtbl_cfg .ias ) - 1 ;
2204
2200
domain -> geometry .force_aperture = true;
2205
2201
2206
- ret = finalise_stage_fn (smmu_domain , master , & pgtbl_cfg );
2202
+ ret = finalise_stage_fn (smmu_domain , & pgtbl_cfg );
2207
2203
if (ret < 0 ) {
2208
2204
free_io_pgtable_ops (pgtbl_ops );
2209
2205
return ret ;
@@ -2413,7 +2409,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
2413
2409
2414
2410
if (!smmu_domain -> smmu ) {
2415
2411
smmu_domain -> smmu = smmu ;
2416
- ret = arm_smmu_domain_finalise (domain , master );
2412
+ ret = arm_smmu_domain_finalise (domain );
2417
2413
if (ret )
2418
2414
smmu_domain -> smmu = NULL ;
2419
2415
} else if (smmu_domain -> smmu != smmu )
0 commit comments