* [PATCH v1] PM-runtime: Make clear what we do when conditions are wrong in rpm_suspend()
@ 2020-05-22 15:09 Andy Shevchenko
2020-05-25 8:58 ` Rafael J. Wysocki
0 siblings, 1 reply; 2+ messages in thread
From: Andy Shevchenko @ 2020-05-22 15:09 UTC (permalink / raw)
To: Rafael J. Wysocki, linux-pm; +Cc: Andy Shevchenko
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;
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v1] PM-runtime: Make clear what we do when conditions are wrong in rpm_suspend()
2020-05-22 15:09 [PATCH v1] PM-runtime: Make clear what we do when conditions are wrong in rpm_suspend() Andy Shevchenko
@ 2020-05-25 8:58 ` Rafael J. Wysocki
0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2020-05-25 8:58 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: Rafael J. Wysocki, Linux PM
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!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-25 8:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-22 15:09 [PATCH v1] PM-runtime: Make clear what we do when conditions are wrong in rpm_suspend() Andy Shevchenko
2020-05-25 8:58 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).