cpuidle: haltpoll: Call cpuidle_poll_state_init() later

Call cpuidle_poll_state_init() only if it is needed to avoid doing
useless work.

Signed-off-by: Li RongQing <lirongqing@baidu.com>
[ rjw: Subject and changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/cpuidle/cpuidle-haltpoll.c b/drivers/cpuidle/cpuidle-haltpoll.c
index fcc53215bac8f5c570daca654fe1ef2b3ff665c0..3a39a7f48b7712632d65515a79cb1f6ebec95cdc 100644 (file)
--- a/drivers/cpuidle/cpuidle-haltpoll.c
+++ b/drivers/cpuidle/cpuidle-haltpoll.c
@@ -108,11 +108,11 @@ static int __init haltpoll_init(void)
        if (boot_option_idle_override != IDLE_NO_OVERRIDE)
                return -ENODEV;
 
-       cpuidle_poll_state_init(drv);
-
        if (!kvm_para_available() || !haltpoll_want())
                return -ENODEV;
 
+       cpuidle_poll_state_init(drv);
+
        ret = cpuidle_register_driver(drv);
        if (ret < 0)
                return ret;