All callers of riscv_iommu_iodir_update() already pass the managed device. Derive the IOMMU instance from that device instead of requiring callers to pass both objects. Signed-off-by: Andrew Jones --- drivers/iommu/riscv/iommu.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/riscv/iommu.c b/drivers/iommu/riscv/iommu.c index d48667112cd9..2cee87ffc122 100644 --- a/drivers/iommu/riscv/iommu.c +++ b/drivers/iommu/riscv/iommu.c @@ -1265,10 +1265,10 @@ static void riscv_iommu_iodir_iotinval(struct riscv_iommu_device *iommu, * device is not quiesced might be disruptive, potentially causing * interim translation faults. */ -static void riscv_iommu_iodir_update(struct riscv_iommu_device *iommu, - struct device *dev, struct riscv_iommu_dc *new_dc) +static void riscv_iommu_iodir_update(struct device *dev, struct riscv_iommu_dc *new_dc) { struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); + struct riscv_iommu_device *iommu = dev_to_iommu(dev); struct riscv_iommu_dc *dc; struct riscv_iommu_command cmd; bool sync_required = false; @@ -1514,7 +1514,7 @@ static int riscv_iommu_attach_paging_domain(struct iommu_domain *iommu_domain, return -EBUSY; } riscv_iommu_bond_link(domain, bond); - riscv_iommu_iodir_update(iommu, dev, &dc); + riscv_iommu_iodir_update(dev, &dc); riscv_iommu_bond_unlink(info->domain, dev); info->domain = domain; riscv_iommu_msi_tables_unlock(old, iommu_domain, flags); @@ -1660,7 +1660,6 @@ static int riscv_iommu_attach_blocking_domain(struct iommu_domain *iommu_domain, struct device *dev, struct iommu_domain *old) { - struct riscv_iommu_device *iommu = dev_to_iommu(dev); struct riscv_iommu_info *info = dev_iommu_priv_get(dev); struct riscv_iommu_dc dc = {0}; unsigned long flags; @@ -1669,7 +1668,7 @@ static int riscv_iommu_attach_blocking_domain(struct iommu_domain *iommu_domain, /* Make device context invalid, translation requests will fault w/ #258 */ flags = riscv_iommu_msi_tables_lock(old, NULL); - riscv_iommu_iodir_update(iommu, dev, &dc); + riscv_iommu_iodir_update(dev, &dc); riscv_iommu_bond_unlink(info->domain, dev); info->domain = NULL; riscv_iommu_msi_tables_unlock(old, NULL, flags); @@ -1688,7 +1687,6 @@ static int riscv_iommu_attach_identity_domain(struct iommu_domain *iommu_domain, struct device *dev, struct iommu_domain *old) { - struct riscv_iommu_device *iommu = dev_to_iommu(dev); struct riscv_iommu_info *info = dev_iommu_priv_get(dev); struct riscv_iommu_dc dc = {0}; unsigned long flags; @@ -1697,7 +1695,7 @@ static int riscv_iommu_attach_identity_domain(struct iommu_domain *iommu_domain, dc.ta = RISCV_IOMMU_PC_TA_V; flags = riscv_iommu_msi_tables_lock(old, NULL); - riscv_iommu_iodir_update(iommu, dev, &dc); + riscv_iommu_iodir_update(dev, &dc); riscv_iommu_bond_unlink(info->domain, dev); info->domain = NULL; riscv_iommu_msi_tables_unlock(old, NULL, flags); -- 2.43.0