| Message ID | 20200220050440.45878-5-john.stultz@linaro.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | driver core: Try to improve and cleanup driver_deferred_probe_check_state() | expand |
On Thu, Feb 20, 2020 at 6:05 AM John Stultz <john.stultz@linaro.org> wrote: > > Now that driver_deferred_probe_check_state() works better, and > we've converted the only user of > driver_deferred_probe_check_state_continue() we can simply > remove it and simplify some of the logic. > > Cc: Rob Herring <robh@kernel.org> > Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> > Cc: Kevin Hilman <khilman@kernel.org> > Cc: Ulf Hansson <ulf.hansson@linaro.org> > Cc: Pavel Machek <pavel@ucw.cz> > Cc: Len Brown <len.brown@intel.com> > Cc: Todd Kjos <tkjos@google.com> > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > Cc: Liam Girdwood <lgirdwood@gmail.com> > Cc: Mark Brown <broonie@kernel.org> > Cc: Thierry Reding <treding@nvidia.com> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: linux-pm@vger.kernel.org > Signed-off-by: John Stultz <john.stultz@linaro.org> > Change-Id: Id5cd5e9264cfb0fbd70a702715174cc4b10006f4 Nice! Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/base/dd.c | 49 +++++------------------------------ > include/linux/device/driver.h | 1 - > 2 files changed, 6 insertions(+), 44 deletions(-) > > diff --git a/drivers/base/dd.c b/drivers/base/dd.c > index fa138f24e2d3..408e4da081da 100644 > --- a/drivers/base/dd.c > +++ b/drivers/base/dd.c > @@ -244,19 +244,6 @@ static int __init deferred_probe_timeout_setup(char *str) > } > __setup("deferred_probe_timeout=", deferred_probe_timeout_setup); > > -static int __driver_deferred_probe_check_state(struct device *dev) > -{ > - if (!initcalls_done || deferred_probe_timeout > 0) > - return -EPROBE_DEFER; > - > - if (!deferred_probe_timeout) { > - dev_WARN(dev, "deferred probe timeout, ignoring dependency"); > - return -ETIMEDOUT; > - } > - > - return 0; > -} > - > /** > * driver_deferred_probe_check_state() - Check deferred probe state > * @dev: device to check > @@ -272,43 +259,19 @@ static int __driver_deferred_probe_check_state(struct device *dev) > */ > int driver_deferred_probe_check_state(struct device *dev) > { > - int ret; > + if (!initcalls_done || deferred_probe_timeout > 0) > + return -EPROBE_DEFER; > > - ret = __driver_deferred_probe_check_state(dev); > - if (ret < 0) > - return ret; > + if (!deferred_probe_timeout) { > + dev_WARN(dev, "deferred probe timeout, ignoring dependency"); > + return -ETIMEDOUT; > + } > > dev_warn(dev, "ignoring dependency for device, assuming no driver"); > > return -ENODEV; > } > > -/** > - * driver_deferred_probe_check_state_continue() - check deferred probe state > - * @dev: device to check > - * > - * Returns -ETIMEDOUT if deferred probe debug timeout has expired, or > - * -EPROBE_DEFER otherwise. > - * > - * Drivers or subsystems can opt-in to calling this function instead of > - * directly returning -EPROBE_DEFER. > - * > - * This is similar to driver_deferred_probe_check_state(), but it allows the > - * subsystem to keep deferring probe after built-in drivers have had a chance > - * to probe. One scenario where that is useful is if built-in drivers rely on > - * resources that are provided by modular drivers. > - */ > -int driver_deferred_probe_check_state_continue(struct device *dev) > -{ > - int ret; > - > - ret = __driver_deferred_probe_check_state(dev); > - if (ret < 0) > - return ret; > - > - return -EPROBE_DEFER; > -} > - > static void deferred_probe_timeout_work_func(struct work_struct *work) > { > struct device_private *private, *p; > diff --git a/include/linux/device/driver.h b/include/linux/device/driver.h > index 1188260f9a02..5242afabfaba 100644 > --- a/include/linux/device/driver.h > +++ b/include/linux/device/driver.h > @@ -238,7 +238,6 @@ driver_find_device_by_acpi_dev(struct device_driver *drv, const void *adev) > > void driver_deferred_probe_add(struct device *dev); > int driver_deferred_probe_check_state(struct device *dev); > -int driver_deferred_probe_check_state_continue(struct device *dev); > void driver_init(void); > > /** > --
On Wed 19 Feb 21:04 PST 2020, John Stultz wrote: > Now that driver_deferred_probe_check_state() works better, and > we've converted the only user of > driver_deferred_probe_check_state_continue() we can simply > remove it and simplify some of the logic. > > Cc: Rob Herring <robh@kernel.org> > Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> > Cc: Kevin Hilman <khilman@kernel.org> > Cc: Ulf Hansson <ulf.hansson@linaro.org> > Cc: Pavel Machek <pavel@ucw.cz> > Cc: Len Brown <len.brown@intel.com> > Cc: Todd Kjos <tkjos@google.com> > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > Cc: Liam Girdwood <lgirdwood@gmail.com> > Cc: Mark Brown <broonie@kernel.org> > Cc: Thierry Reding <treding@nvidia.com> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: linux-pm@vger.kernel.org > Signed-off-by: John Stultz <john.stultz@linaro.org> > Change-Id: Id5cd5e9264cfb0fbd70a702715174cc4b10006f4 Change-Id... Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > --- > drivers/base/dd.c | 49 +++++------------------------------ > include/linux/device/driver.h | 1 - > 2 files changed, 6 insertions(+), 44 deletions(-) > > diff --git a/drivers/base/dd.c b/drivers/base/dd.c > index fa138f24e2d3..408e4da081da 100644 > --- a/drivers/base/dd.c > +++ b/drivers/base/dd.c > @@ -244,19 +244,6 @@ static int __init deferred_probe_timeout_setup(char *str) > } > __setup("deferred_probe_timeout=", deferred_probe_timeout_setup); > > -static int __driver_deferred_probe_check_state(struct device *dev) > -{ > - if (!initcalls_done || deferred_probe_timeout > 0) > - return -EPROBE_DEFER; > - > - if (!deferred_probe_timeout) { > - dev_WARN(dev, "deferred probe timeout, ignoring dependency"); > - return -ETIMEDOUT; > - } > - > - return 0; > -} > - > /** > * driver_deferred_probe_check_state() - Check deferred probe state > * @dev: device to check > @@ -272,43 +259,19 @@ static int __driver_deferred_probe_check_state(struct device *dev) > */ > int driver_deferred_probe_check_state(struct device *dev) > { > - int ret; > + if (!initcalls_done || deferred_probe_timeout > 0) > + return -EPROBE_DEFER; > > - ret = __driver_deferred_probe_check_state(dev); > - if (ret < 0) > - return ret; > + if (!deferred_probe_timeout) { > + dev_WARN(dev, "deferred probe timeout, ignoring dependency"); > + return -ETIMEDOUT; > + } > > dev_warn(dev, "ignoring dependency for device, assuming no driver"); > > return -ENODEV; > } > > -/** > - * driver_deferred_probe_check_state_continue() - check deferred probe state > - * @dev: device to check > - * > - * Returns -ETIMEDOUT if deferred probe debug timeout has expired, or > - * -EPROBE_DEFER otherwise. > - * > - * Drivers or subsystems can opt-in to calling this function instead of > - * directly returning -EPROBE_DEFER. > - * > - * This is similar to driver_deferred_probe_check_state(), but it allows the > - * subsystem to keep deferring probe after built-in drivers have had a chance > - * to probe. One scenario where that is useful is if built-in drivers rely on > - * resources that are provided by modular drivers. > - */ > -int driver_deferred_probe_check_state_continue(struct device *dev) > -{ > - int ret; > - > - ret = __driver_deferred_probe_check_state(dev); > - if (ret < 0) > - return ret; > - > - return -EPROBE_DEFER; > -} > - > static void deferred_probe_timeout_work_func(struct work_struct *work) > { > struct device_private *private, *p; > diff --git a/include/linux/device/driver.h b/include/linux/device/driver.h > index 1188260f9a02..5242afabfaba 100644 > --- a/include/linux/device/driver.h > +++ b/include/linux/device/driver.h > @@ -238,7 +238,6 @@ driver_find_device_by_acpi_dev(struct device_driver *drv, const void *adev) > > void driver_deferred_probe_add(struct device *dev); > int driver_deferred_probe_check_state(struct device *dev); > -int driver_deferred_probe_check_state_continue(struct device *dev); > void driver_init(void); > > /** > -- > 2.17.1 >
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index fa138f24e2d3..408e4da081da 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -244,19 +244,6 @@ static int __init deferred_probe_timeout_setup(char *str) } __setup("deferred_probe_timeout=", deferred_probe_timeout_setup); -static int __driver_deferred_probe_check_state(struct device *dev) -{ - if (!initcalls_done || deferred_probe_timeout > 0) - return -EPROBE_DEFER; - - if (!deferred_probe_timeout) { - dev_WARN(dev, "deferred probe timeout, ignoring dependency"); - return -ETIMEDOUT; - } - - return 0; -} - /** * driver_deferred_probe_check_state() - Check deferred probe state * @dev: device to check @@ -272,43 +259,19 @@ static int __driver_deferred_probe_check_state(struct device *dev) */ int driver_deferred_probe_check_state(struct device *dev) { - int ret; + if (!initcalls_done || deferred_probe_timeout > 0) + return -EPROBE_DEFER; - ret = __driver_deferred_probe_check_state(dev); - if (ret < 0) - return ret; + if (!deferred_probe_timeout) { + dev_WARN(dev, "deferred probe timeout, ignoring dependency"); + return -ETIMEDOUT; + } dev_warn(dev, "ignoring dependency for device, assuming no driver"); return -ENODEV; } -/** - * driver_deferred_probe_check_state_continue() - check deferred probe state - * @dev: device to check - * - * Returns -ETIMEDOUT if deferred probe debug timeout has expired, or - * -EPROBE_DEFER otherwise. - * - * Drivers or subsystems can opt-in to calling this function instead of - * directly returning -EPROBE_DEFER. - * - * This is similar to driver_deferred_probe_check_state(), but it allows the - * subsystem to keep deferring probe after built-in drivers have had a chance - * to probe. One scenario where that is useful is if built-in drivers rely on - * resources that are provided by modular drivers. - */ -int driver_deferred_probe_check_state_continue(struct device *dev) -{ - int ret; - - ret = __driver_deferred_probe_check_state(dev); - if (ret < 0) - return ret; - - return -EPROBE_DEFER; -} - static void deferred_probe_timeout_work_func(struct work_struct *work) { struct device_private *private, *p; diff --git a/include/linux/device/driver.h b/include/linux/device/driver.h index 1188260f9a02..5242afabfaba 100644 --- a/include/linux/device/driver.h +++ b/include/linux/device/driver.h @@ -238,7 +238,6 @@ driver_find_device_by_acpi_dev(struct device_driver *drv, const void *adev) void driver_deferred_probe_add(struct device *dev); int driver_deferred_probe_check_state(struct device *dev); -int driver_deferred_probe_check_state_continue(struct device *dev); void driver_init(void); /**
Now that driver_deferred_probe_check_state() works better, and we've converted the only user of driver_deferred_probe_check_state_continue() we can simply remove it and simplify some of the logic. Cc: Rob Herring <robh@kernel.org> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Kevin Hilman <khilman@kernel.org> Cc: Ulf Hansson <ulf.hansson@linaro.org> Cc: Pavel Machek <pavel@ucw.cz> Cc: Len Brown <len.brown@intel.com> Cc: Todd Kjos <tkjos@google.com> Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Mark Brown <broonie@kernel.org> Cc: Thierry Reding <treding@nvidia.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-pm@vger.kernel.org Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: Id5cd5e9264cfb0fbd70a702715174cc4b10006f4 --- drivers/base/dd.c | 49 +++++------------------------------ include/linux/device/driver.h | 1 - 2 files changed, 6 insertions(+), 44 deletions(-)