[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <63116bb9adaf7336a019ce087fbe17c4ace81cea.1379779777.git.viresh.kumar@linaro.org>
Date: Sun, 22 Sep 2013 06:51:01 +0530
From: Viresh Kumar <viresh.kumar@...aro.org>
To: rjw@...k.pl, daniel.lezcano@...aro.org
Cc: linaro-kernel@...ts.linaro.org, patches@...aro.org,
linux-pm@...r.kernel.org, linux-kernel@...r.kernel.org,
Viresh Kumar <viresh.kumar@...aro.org>
Subject: [PATCH 09/21] cpuidle: merge two if() statements for checking error cases
Both return same error message and so better write them in a single line.
Signed-off-by: Viresh Kumar <viresh.kumar@...aro.org>
---
drivers/cpuidle/cpuidle.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index aec9029..b8c63cb 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -119,10 +119,7 @@ int cpuidle_idle_call(void)
struct cpuidle_driver *drv;
int next_state, entered_state;
- if (cpuidle_disabled())
- return -ENODEV;
-
- if (!initialized)
+ if (cpuidle_disabled() || !initialized)
return -ENODEV;
/* check if the device is ready */
--
1.7.12.rc2.18.g61b472e
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists