diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-12-03 15:04:41 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-12-06 10:17:57 -0500 |
commit | 965c4ac0613b071d6f035334c5d9d942013df4f9 (patch) | |
tree | 6108441b938fe0c309a09e96784edcc91d9b8b3f /drivers | |
parent | e1b1903eee71c5fa6063bbf713cfc947e76c4e04 (diff) |
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 'drivers')
-rw-r--r-- | drivers/base/power/runtime.c | 8 |
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) | |||
791 | */ | 791 | */ |
792 | if (!parent->power.disable_depth | 792 | if (!parent->power.disable_depth |
793 | && !parent->power.ignore_children | 793 | && !parent->power.ignore_children |
794 | && parent->power.runtime_status != RPM_ACTIVE) { | 794 | && parent->power.runtime_status != RPM_ACTIVE) |
795 | error = -EBUSY; | 795 | error = -EBUSY; |
796 | } else { | 796 | else if (dev->power.runtime_status == RPM_SUSPENDED) |
797 | if (dev->power.runtime_status == RPM_SUSPENDED) | 797 | atomic_inc(&parent->power.child_count); |
798 | atomic_inc(&parent->power.child_count); | ||
799 | } | ||
800 | 798 | ||
801 | spin_unlock(&parent->power.lock); | 799 | spin_unlock(&parent->power.lock); |
802 | 800 | ||