[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@linaro.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 */