aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/power/runtime.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2009-12-03 21:04:41 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2009-12-06 16:17:57 +0100
commit965c4ac0613b071d6f035334c5d9d942013df4f9 (patch)
tree6108441b938fe0c309a09e96784edcc91d9b8b3f /drivers/base/power/runtime.c
parentPM / Runtime: Make documentation of runtime_idle() agree with the code (diff)
downloadlinux-dev-965c4ac0613b071d6f035334c5d9d942013df4f9.tar.xz
linux-dev-965c4ac0613b071d6f035334c5d9d942013df4f9.zip
PM / Runtime: Remove unnecessary braces in __pm_runtime_set_status()
Some braces in __pm_runtime_set_status() are not necessary, so remove them. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to '')
-rw-r--r--drivers/base/power/runtime.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 637706951885..5a01ecef4af3 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -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);