From: Rafael J. Wysocki Date: Thu, 3 Dec 2009 20:04:41 +0000 (+0100) Subject: PM / Runtime: Remove unnecessary braces in __pm_runtime_set_status() X-Git-Tag: upstream/snapshot3+hdmi~16447^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=965c4ac0613b071d6f035334c5d9d942013df4f9;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 --- diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 6377069..5a01ece 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);