lkml.org 
[lkml]   [2017]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/4] cpufreq: Clean up cpufreq_parse_governor()
Date
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Drop an unnecessary local variable from cpufreq_parse_governor()
and rearrange the code in there to make it easier to follow.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/cpufreq/cpufreq.c | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)

Index: linux-pm/drivers/cpufreq/cpufreq.c
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq.c
+++ linux-pm/drivers/cpufreq/cpufreq.c
@@ -604,16 +604,15 @@ static struct cpufreq_governor *find_gov
static int cpufreq_parse_governor(char *str_governor, unsigned int *policy,
struct cpufreq_governor **governor)
{
- int err = -EINVAL;
-
if (cpufreq_driver->setpolicy) {
if (!strncasecmp(str_governor, "performance", CPUFREQ_NAME_LEN)) {
*policy = CPUFREQ_POLICY_PERFORMANCE;
- err = 0;
- } else if (!strncasecmp(str_governor, "powersave",
- CPUFREQ_NAME_LEN)) {
+ return 0;
+ }
+
+ if (!strncasecmp(str_governor, "powersave", CPUFREQ_NAME_LEN)) {
*policy = CPUFREQ_POLICY_POWERSAVE;
- err = 0;
+ return 0;
}
} else {
struct cpufreq_governor *t;
@@ -621,26 +620,29 @@ static int cpufreq_parse_governor(char *
mutex_lock(&cpufreq_governor_mutex);

t = find_governor(str_governor);
-
- if (t == NULL) {
+ if (!t) {
int ret;

mutex_unlock(&cpufreq_governor_mutex);
+
ret = request_module("cpufreq_%s", str_governor);
+ if (ret)
+ return -EINVAL;
+
mutex_lock(&cpufreq_governor_mutex);

- if (ret == 0)
- t = find_governor(str_governor);
+ t = find_governor(str_governor);
}

- if (t != NULL) {
+ mutex_unlock(&cpufreq_governor_mutex);
+
+ if (t) {
*governor = t;
- err = 0;
+ return 0;
}
-
- mutex_unlock(&cpufreq_governor_mutex);
}
- return err;
+
+ return -EINVAL;
}

/**

\
 
 \ /
  Last update: 2017-11-23 01:32    [W:0.072 / U:23.952 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site