From: Gaurav Jindal <gauravjindal1104@gmail.com>
Date: Fri, 1 Sep 2017 15:07:26 +0000 (+0530)
Subject: cpuidle: Clean up cpuidle_enable_device() error handling a bit
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e7b06a09e7d87ec0d6d8b17eec50fbb93667eee1;p=linux.git

cpuidle: Clean up cpuidle_enable_device() error handling a bit

Do not fetch per CPU drv if cpuidle_curr_governor is NULL
to avoid useless per CPU processing.

Signed-off-by: Gaurav Jindal <gauravjindal1104@gmail.com>
[ rjw: Subject & changelog ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index ed4df58a855e1..27f9648b61c2b 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -388,9 +388,12 @@ int cpuidle_enable_device(struct cpuidle_device *dev)
 	if (dev->enabled)
 		return 0;
 
+	if (!cpuidle_curr_governor)
+		return -EIO;
+
 	drv = cpuidle_get_cpu_driver(dev);
 
-	if (!drv || !cpuidle_curr_governor)
+	if (!drv)
 		return -EIO;
 
 	if (!dev->registered)