From: Rob Herring <robh@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linus Walleij <linus.walleij@linaro.org>,
Alexander Graf <agraf@suse.de>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Kevin Hilman <khilman@kernel.org>,
Ulf Hansson <ulf.hansson@linaro.org>,
Joerg Roedel <joro@8bytes.org>,
Robin Murphy <robin.murphy@arm.com>,
Mark Brown <broonie@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
boot-architecture@lists.linaro.org,
linux-arm-kernel@lists.infradead.org,
iommu@lists.linux-foundation.org, Joerg Roedel <jroedel@suse.de>
Subject: [PATCH v4 4/6] iommu: Stop deferring probe at end of initcalls
Date: Mon, 9 Jul 2018 09:41:51 -0600 [thread overview]
Message-ID: <20180709154153.15742-5-robh@kernel.org> (raw)
In-Reply-To: <20180709154153.15742-1-robh@kernel.org>
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>
---
drivers/iommu/of_iommu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
}
--
2.17.1
next prev parent reply other threads:[~2018-07-09 15:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-09 15:41 [PATCH v4 0/6] Make deferring probe forever optional Rob Herring
2018-07-09 15:41 ` [PATCH v4 1/6] driver core: allow stopping deferred probe after init Rob Herring
2018-07-09 15:52 ` Russell King - ARM Linux
2018-07-09 17:47 ` Rob Herring
2018-07-09 15:41 ` [PATCH v4 2/6] dt-bindings: pinctrl: add a 'pinctrl-use-default' property Rob Herring
2018-07-09 15:41 ` [PATCH v4 3/6] pinctrl: Support stopping deferred probe after initcalls Rob Herring
2018-07-09 15:41 ` Rob Herring [this message]
2018-07-09 15:41 ` [PATCH v4 5/6] iommu: Remove IOMMU_OF_DECLARE Rob Herring
2018-07-09 15:41 ` [PATCH v4 6/6] PM / Domains: Stop deferring probe at the end of initcall Rob Herring
2018-07-09 22:49 ` Ulf Hansson
2018-07-10 14:25 ` Rob Herring
2018-07-11 9:41 ` Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180709154153.15742-5-robh@kernel.org \
--to=robh@kernel.org \
--cc=agraf@suse.de \
--cc=bjorn.andersson@linaro.org \
--cc=boot-architecture@lists.linaro.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=khilman@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=robin.murphy@arm.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).