iommu/arm-smmu-v3: Clean up bus_set_iommu()

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

Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/6235f07df013776656a61bb642023ecce07f46cc.1660572783.git.robin.murphy@arm.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index fceab59..241efb7 100644 (file)
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -28,8 +28,6 @@
 #include <linux/pci-ats.h>
 #include <linux/platform_device.h>
 
-#include <linux/amba/bus.h>
-
 #include "arm-smmu-v3.h"
 #include "../../iommu-sva-lib.h"
 
@@ -3676,43 +3674,6 @@ static unsigned long arm_smmu_resource_size(struct arm_smmu_device *smmu)
                return SZ_128K;
 }
 
-static int arm_smmu_set_bus_ops(struct iommu_ops *ops)
-{
-       int err;
-
-#ifdef CONFIG_PCI
-       if (pci_bus_type.iommu_ops != ops) {
-               err = bus_set_iommu(&pci_bus_type, ops);
-               if (err)
-                       return err;
-       }
-#endif
-#ifdef CONFIG_ARM_AMBA
-       if (amba_bustype.iommu_ops != ops) {
-               err = bus_set_iommu(&amba_bustype, ops);
-               if (err)
-                       goto err_reset_pci_ops;
-       }
-#endif
-       if (platform_bus_type.iommu_ops != ops) {
-               err = bus_set_iommu(&platform_bus_type, ops);
-               if (err)
-                       goto err_reset_amba_ops;
-       }
-
-       return 0;
-
-err_reset_amba_ops:
-#ifdef CONFIG_ARM_AMBA
-       bus_set_iommu(&amba_bustype, NULL);
-#endif
-err_reset_pci_ops: __maybe_unused;
-#ifdef CONFIG_PCI
-       bus_set_iommu(&pci_bus_type, NULL);
-#endif
-       return err;
-}
-
 static void __iomem *arm_smmu_ioremap(struct device *dev, resource_size_t start,
                                      resource_size_t size)
 {
@@ -3851,27 +3812,17 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
        ret = iommu_device_register(&smmu->iommu, &arm_smmu_ops, dev);
        if (ret) {
                dev_err(dev, "Failed to register iommu\n");
-               goto err_sysfs_remove;
+               iommu_device_sysfs_remove(&smmu->iommu);
+               return ret;
        }
 
-       ret = arm_smmu_set_bus_ops(&arm_smmu_ops);
-       if (ret)
-               goto err_unregister_device;
-
        return 0;
-
-err_unregister_device:
-       iommu_device_unregister(&smmu->iommu);
-err_sysfs_remove:
-       iommu_device_sysfs_remove(&smmu->iommu);
-       return ret;
 }
 
 static int arm_smmu_device_remove(struct platform_device *pdev)
 {
        struct arm_smmu_device *smmu = platform_get_drvdata(pdev);
 
-       arm_smmu_set_bus_ops(NULL);
        iommu_device_unregister(&smmu->iommu);
        iommu_device_sysfs_remove(&smmu->iommu);
        arm_smmu_device_disable(smmu);