From: Li RongQing <lirongqing@baidu.com>
Date: Fri, 4 Mar 2022 07:53:28 +0000 (+0800)
Subject: cpuidle: haltpoll: Call cpuidle_poll_state_init() later
X-Git-Tag: v5.18-rc1~203^2~3^3~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=659b66e98bb38dc6300dca3c9ebebeba194b575b;p=thirdparty%2Fkernel%2Flinux.git

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 fcc53215bac8f..3a39a7f48b771 100644
--- 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;