From: Rob Herring Date: Mon, 9 Jul 2018 15:41:51 +0000 (-0600) Subject: iommu: Stop deferring probe at end of initcalls X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=78f307be3e0bc85f25dc05baa60f7435a88c2abf;p=openwrt%2Fstaging%2Fblogic.git iommu: Stop deferring probe at end of initcalls 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 Cc: iommu@lists.linux-foundation.org Signed-off-by: Rob Herring Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 5c36a8b7656a..78ddf47dd67a 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -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); }