PM / Runtime: Remove unnecessary braces in __pm_runtime_set_status()
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 3 Dec 2009 20:04:41 +0000 (21:04 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Sun, 6 Dec 2009 15:17:57 +0000 (16:17 +0100)
Some braces in __pm_runtime_set_status() are not necessary, so
remove them.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
drivers/base/power/runtime.c

index 6377069518854a726a2e3b24ae4ad6e4f769b8d3..5a01ecef4af3600da40b8e458bc670d1223d2fbe 100644 (file)
@@ -791,12 +791,10 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status)
                 */
                if (!parent->power.disable_depth
                    && !parent->power.ignore_children
-                   && parent->power.runtime_status != RPM_ACTIVE) {
+                   && parent->power.runtime_status != RPM_ACTIVE)
                        error = -EBUSY;
-               } else {
-                       if (dev->power.runtime_status == RPM_SUSPENDED)
-                               atomic_inc(&parent->power.child_count);
-               }
+               else if (dev->power.runtime_status == RPM_SUSPENDED)
+                       atomic_inc(&parent->power.child_count);
 
                spin_unlock(&parent->power.lock);