OSDN Git Service

PM: runtime: Make clear what we do when conditions are wrong in rpm_suspend()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 22 May 2020 15:09:55 +0000 (18:09 +0300)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 25 May 2020 08:54:39 +0000 (10:54 +0200)
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>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/base/power/runtime.c

index 99c7da1..9f62790 100644 (file)
@@ -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;