pinctrl: Remove use of driver_deferred_probe_check_state_continue()
With the earlier sanity fixes to driver_deferred_probe_check_state() it should be usable for the pinctrl logic here. So tweak the logic to use driver_deferred_probe_check_state() instead of driver_deferred_probe_check_state_continue() Cc: linux-pm@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Thierry Reding <treding@nvidia.com> Cc: Mark Brown <broonie@kernel.org> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: Saravana Kannan <saravanak@google.com> Cc: Todd Kjos <tkjos@google.com> Cc: Len Brown <len.brown@intel.com> Cc: Pavel Machek <pavel@ucw.cz> Cc: Ulf Hansson <ulf.hansson@linaro.org> Cc: Kevin Hilman <khilman@kernel.org> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Rob Herring <robh@kernel.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: John Stultz <john.stultz@linaro.org> Link: https://lore.kernel.org/r/20200225050828.56458-4-john.stultz@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
e2cec7d685
Коммит
bec6c0ecb2
|
@ -127,11 +127,12 @@ static int dt_to_map_one_config(struct pinctrl *p,
|
||||||
np_pctldev = of_get_next_parent(np_pctldev);
|
np_pctldev = of_get_next_parent(np_pctldev);
|
||||||
if (!np_pctldev || of_node_is_root(np_pctldev)) {
|
if (!np_pctldev || of_node_is_root(np_pctldev)) {
|
||||||
of_node_put(np_pctldev);
|
of_node_put(np_pctldev);
|
||||||
|
ret = driver_deferred_probe_check_state(p->dev);
|
||||||
/* keep deferring if modules are enabled unless we've timed out */
|
/* keep deferring if modules are enabled unless we've timed out */
|
||||||
if (IS_ENABLED(CONFIG_MODULES) && !allow_default)
|
if (IS_ENABLED(CONFIG_MODULES) && !allow_default &&
|
||||||
return driver_deferred_probe_check_state_continue(p->dev);
|
(ret == -ENODEV))
|
||||||
|
ret = -EPROBE_DEFER;
|
||||||
return driver_deferred_probe_check_state(p->dev);
|
return ret;
|
||||||
}
|
}
|
||||||
/* If we're creating a hog we can use the passed pctldev */
|
/* If we're creating a hog we can use the passed pctldev */
|
||||||
if (hog_pctldev && (np_pctldev == p->dev->of_node)) {
|
if (hog_pctldev && (np_pctldev == p->dev->of_node)) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче