Merge back earlier cpuidle material for 3.19-rc1.

[deliverable/linux.git] / drivers / cpuidle / cpuidle-arm64.c

diff --git a/drivers/cpuidle/cpuidle-arm64.c b/drivers/cpuidle/cpuidle-arm64.c
index 87320e62c721ae7bac8f1540ee681a2c169a72a6..80704b931ba48e42ec2de9aa9175298c2e2b007d 100644 (file)
--- a/drivers/cpuidle/cpuidle-arm64.c
+++ b/drivers/cpuidle/cpuidle-arm64.c
@@ -103,11 +103,8 @@ static int __init arm64_idle_init(void)
         * reason to initialize the idle driver if only wfi is supported.
         */
        ret = dt_init_idle_driver(drv, arm64_idle_state_match, 1);
-       if (ret <= 0) {
-               if (ret)
-                       pr_err("failed to initialize idle states\n");
+       if (ret <= 0)
                return ret ? : -ENODEV;
-       }
 
        /*
         * Call arch CPU operations in order to initialize
@@ -121,12 +118,6 @@ static int __init arm64_idle_init(void)
                }
        }
 
-       ret = cpuidle_register(drv, NULL);
-       if (ret) {
-               pr_err("failed to register cpuidle driver\n");
-               return ret;
-       }
-
-       return 0;
+       return cpuidle_register(drv, NULL);
 }
 device_initcall(arm64_idle_init);