Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

John Stultz and committed by
Greg Kroah-Hartman
bec6c0ec e2cec7d6

+5 -4
+5 -4
drivers/pinctrl/devicetree.c
··· 127 127 np_pctldev = of_get_next_parent(np_pctldev); 128 128 if (!np_pctldev || of_node_is_root(np_pctldev)) { 129 129 of_node_put(np_pctldev); 130 + ret = driver_deferred_probe_check_state(p->dev); 130 131 /* keep deferring if modules are enabled unless we've timed out */ 131 - if (IS_ENABLED(CONFIG_MODULES) && !allow_default) 132 - return driver_deferred_probe_check_state_continue(p->dev); 133 - 134 - return driver_deferred_probe_check_state(p->dev); 132 + if (IS_ENABLED(CONFIG_MODULES) && !allow_default && 133 + (ret == -ENODEV)) 134 + ret = -EPROBE_DEFER; 135 + return ret; 135 136 } 136 137 /* If we're creating a hog we can use the passed pctldev */ 137 138 if (hog_pctldev && (np_pctldev == p->dev->of_node)) {