| Message ID | 20200522150955.40569-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [v1] PM-runtime: Make clear what we do when conditions are wrong in rpm_suspend() | expand |
On Fri, May 22, 2020 at 5:10 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > rpm_suspend() simple bails out when conditions are wrong. But this is not > immediately obvious from the code. Make it clear what we do when conditions > are wrong in rpm_suspend(). > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/base/power/runtime.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c > index 99c7da112c95..9f62790f644c 100644 > --- a/drivers/base/power/runtime.c > +++ b/drivers/base/power/runtime.c > @@ -523,13 +523,11 @@ static int rpm_suspend(struct device *dev, int rpmflags) > > repeat: > retval = rpm_check_suspend_allowed(dev); > - > if (retval < 0) > - ; /* Conditions are wrong. */ > + goto out; /* Conditions are wrong. */ > > /* Synchronous suspends are not allowed in the RPM_RESUMING state. */ > - else if (dev->power.runtime_status == RPM_RESUMING && > - !(rpmflags & RPM_ASYNC)) > + if (dev->power.runtime_status == RPM_RESUMING && !(rpmflags & RPM_ASYNC)) > retval = -EAGAIN; > if (retval) > goto out; > -- Applied as 5.8 material, thanks!
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 99c7da112c95..9f62790f644c 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -523,13 +523,11 @@ static int rpm_suspend(struct device *dev, int rpmflags) repeat: retval = rpm_check_suspend_allowed(dev); - if (retval < 0) - ; /* Conditions are wrong. */ + goto out; /* Conditions are wrong. */ /* Synchronous suspends are not allowed in the RPM_RESUMING state. */ - else if (dev->power.runtime_status == RPM_RESUMING && - !(rpmflags & RPM_ASYNC)) + if (dev->power.runtime_status == RPM_RESUMING && !(rpmflags & RPM_ASYNC)) retval = -EAGAIN; if (retval) goto out;
rpm_suspend() simple bails out when conditions are wrong. But this is not immediately obvious from the code. Make it clear what we do when conditions are wrong in rpm_suspend(). Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/base/power/runtime.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)