[PATCH 09/13] iommu/mtk: Clean up bus_set_iommu()

[Robin Murphy]

Stop calling bus_set_iommu() since it's now unnecessary, and simplify
the probe failure paths accordingly.

Signed-off-by: Robin Murphy <robin.mur...@arm.com>
---
 drivers/iommu/mtk_iommu.c    | 13 +------------
 drivers/iommu/mtk_iommu_v1.c | 13 +------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 6fd75a60abd6..4278d9e032ad 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -920,19 +920,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)
        spin_lock_init(&data->tlb_lock);
        list_add_tail(&data->list, &m4ulist);
 
-       if (!iommu_present(&platform_bus_type)) {
-               ret = bus_set_iommu(&platform_bus_type, &mtk_iommu_ops);
-               if (ret)
-                       goto out_list_del;
-       }
-
        ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
        if (ret)
-               goto out_bus_set_null;
+               goto out_list_del;
        return ret;
 
-out_bus_set_null:
-       bus_set_iommu(&platform_bus_type, NULL);
 out_list_del:
        list_del(&data->list);
        iommu_device_unregister(&data->iommu);
@@ -952,9 +944,6 @@ static int mtk_iommu_remove(struct platform_device *pdev)
        iommu_device_sysfs_remove(&data->iommu);
        iommu_device_unregister(&data->iommu);
 
-       if (iommu_present(&platform_bus_type))
-               bus_set_iommu(&platform_bus_type, NULL);
-
        clk_disable_unprepare(data->bclk);
        device_link_remove(data->smicomm_dev, &pdev->dev);
        pm_runtime_disable(&pdev->dev);
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index ecff800656e6..7d17d6a21803 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -660,19 +660,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)
        if (ret)
                goto out_sysfs_remove;
 
-       if (!iommu_present(&platform_bus_type)) {
-               ret = bus_set_iommu(&platform_bus_type,  &mtk_iommu_ops);
-               if (ret)
-                       goto out_dev_unreg;
-       }
-
        ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
        if (ret)
-               goto out_bus_set_null;
+               goto out_dev_unreg;
        return ret;
 
-out_bus_set_null:
-       bus_set_iommu(&platform_bus_type, NULL);
 out_dev_unreg:
        iommu_device_unregister(&data->iommu);
 out_sysfs_remove:
@@ -687,9 +679,6 @@ static int mtk_iommu_remove(struct platform_device *pdev)
        iommu_device_sysfs_remove(&data->iommu);
        iommu_device_unregister(&data->iommu);
 
-       if (iommu_present(&platform_bus_type))
-               bus_set_iommu(&platform_bus_type, NULL);
-
        clk_disable_unprepare(data->bclk);
        devm_free_irq(&pdev->dev, data->irq, data);
        component_master_del(&pdev->dev, &mtk_iommu_com_ops);
-- 
2.28.0.dirty

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu