summaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq/cpufreq.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-11-23 01:23:16 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-12-04 15:35:40 +0100
commit045149e6a22119e5bf0d16a0b24a4173a2abb71d (patch)
tree818f9d7a7be17e41bd2a5362aeb2ac3d8a1f9df3 /drivers/cpufreq/cpufreq.c
parentae64f9bd1d3621b5e60d7363bc20afb46aede215 (diff)
downloadlinux-045149e6a22119e5bf0d16a0b24a4173a2abb71d.tar.bz2
cpufreq: Clean up cpufreq_parse_governor()
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> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
-rw-r--r--drivers/cpufreq/cpufreq.c32
1 files changed, 17 insertions, 15 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 41d148af7748..4d76b7c57b7a 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -604,16 +604,15 @@ static struct cpufreq_governor *find_governor(const char *str_governor)
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 *str_governor, unsigned int *policy,
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;
}
/**