iommu: Stop deferring probe at end of initcalls
authorRob Herring <robh@kernel.org>
Mon, 9 Jul 2018 15:41:51 +0000 (09:41 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 10 Jul 2018 15:22:35 +0000 (17:22 +0200)
The IOMMU subsystem has its own mechanism to not defer probe if driver
support is missing. Now that the driver core supports stopping deferring
probe if drivers aren't built-in (and probed), use the driver core
support so the IOMMU specific support can be removed.

Acked-by: Joerg Roedel <jroedel@suse.de>
Cc: iommu@lists.linux-foundation.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iommu/of_iommu.c

index 5c36a8b7656ae2b4f298dfa9793807085e9e0708..78ddf47dd67aef221a8e313be172d0c36459ecc1 100644 (file)
@@ -133,7 +133,7 @@ static int of_iommu_xlate(struct device *dev,
         * a proper probe-ordering dependency mechanism in future.
         */
        if (!ops)
-               return -EPROBE_DEFER;
+               return driver_deferred_probe_check_state(dev);
 
        return ops->of_xlate(dev, iommu_spec);
 }