| Message ID | 1456359748-22838-2-git-send-email-dbasehore@chromium.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Wednesday, February 24, 2016 04:22:27 PM Derek Basehore wrote: > This tries to runtime suspend devices that are still active for direct > complete. This is for cases such as autosuspend delays which leaves > devices able to runtime suspend but still active. It's beneficial in > this case to runtime suspend the device to take advantage of direct > complete when possible. > > Signed-off-by: Derek Basehore <dbasehore@chromium.org> > Reviewed-by: Eric Caruso <ejcaruso@chromium.org> > --- > drivers/base/power/main.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c > index e0017d9..9693032 100644 > --- a/drivers/base/power/main.c > +++ b/drivers/base/power/main.c > @@ -1380,7 +1380,12 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) > goto Complete; > > if (dev->power.direct_complete) { > - if (pm_runtime_status_suspended(dev)) { > + /* > + * Check if we're runtime suspended. If not, try to runtime > + * suspend for autosuspend cases. > + */ > + if (pm_runtime_status_suspended(dev) || > + !pm_runtime_suspend(dev)) { > pm_runtime_disable(dev); > if (pm_runtime_status_suspended(dev)) > goto Complete; > This can be done somewhat simpler, because pm_runtime_suspend() will check if the device has already been suspended: ret = pm_runtime_suspend(dev); if (ret >= 0) { and you don't need the extra pm_runtime_status_suspended(dev) check. Thanks, Rafael -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Feb 27, 2016 at 5:31 PM, Rafael J. Wysocki <rjw@rjwysocki.net> wrote: > On Wednesday, February 24, 2016 04:22:27 PM Derek Basehore wrote: >> This tries to runtime suspend devices that are still active for direct >> complete. This is for cases such as autosuspend delays which leaves >> devices able to runtime suspend but still active. It's beneficial in >> this case to runtime suspend the device to take advantage of direct >> complete when possible. >> >> Signed-off-by: Derek Basehore <dbasehore@chromium.org> >> Reviewed-by: Eric Caruso <ejcaruso@chromium.org> >> --- >> drivers/base/power/main.c | 7 ++++++- >> 1 file changed, 6 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c >> index e0017d9..9693032 100644 >> --- a/drivers/base/power/main.c >> +++ b/drivers/base/power/main.c >> @@ -1380,7 +1380,12 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) >> goto Complete; >> >> if (dev->power.direct_complete) { >> - if (pm_runtime_status_suspended(dev)) { >> + /* >> + * Check if we're runtime suspended. If not, try to runtime >> + * suspend for autosuspend cases. >> + */ >> + if (pm_runtime_status_suspended(dev) || >> + !pm_runtime_suspend(dev)) { >> pm_runtime_disable(dev); >> if (pm_runtime_status_suspended(dev)) >> goto Complete; >> > > This can be done somewhat simpler, because pm_runtime_suspend() will check > if the device has already been suspended: > > ret = pm_runtime_suspend(dev); > if (ret >= 0) { > > and you don't need the extra pm_runtime_status_suspended(dev) check. > > Thanks, > Rafael > I'll look into simplifying it for the next patch set. -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index e0017d9..9693032 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1380,7 +1380,12 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) goto Complete; if (dev->power.direct_complete) { - if (pm_runtime_status_suspended(dev)) { + /* + * Check if we're runtime suspended. If not, try to runtime + * suspend for autosuspend cases. + */ + if (pm_runtime_status_suspended(dev) || + !pm_runtime_suspend(dev)) { pm_runtime_disable(dev); if (pm_runtime_status_suspended(dev)) goto Complete;