summaryrefslogtreecommitdiff
path: root/drivers/iommu/of_iommu.c
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2018-07-09 18:41:51 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-07-10 18:22:35 +0300
commit78f307be3e0bc85f25dc05baa60f7435a88c2abf (patch)
tree6b2ba757613460d8d210373f90077ad7d0c97c57 /drivers/iommu/of_iommu.c
parentd19c5e79d46efdf89306be99f3c8824cf58e35f6 (diff)
downloadlinux-78f307be3e0bc85f25dc05baa60f7435a88c2abf.tar.xz
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 <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>
Diffstat (limited to 'drivers/iommu/of_iommu.c')
-rw-r--r--drivers/iommu/of_iommu.c2
1 files changed, 1 insertions, 1 deletions
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);
}