Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 15:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cpufreq: Clean up cpufreq_parse_governor()

Browse Source 
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>
This commit is contained in:
Rafael J. Wysocki 2017-11-23 01:23:16 +01:00
parent ae64f9bd1d
commit 045149e6a2
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/cpufreq/cpufreq.c
View File

@ -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, static int cpufreq_parse_governor(char *str_governor, unsigned int *policy,
struct cpufreq_governor **governor) struct cpufreq_governor **governor)
{ {
int err = -EINVAL;
if (cpufreq_driver->setpolicy) { if (cpufreq_driver->setpolicy) {
if (!strncasecmp(str_governor, "performance", CPUFREQ_NAME_LEN)) { if (!strncasecmp(str_governor, "performance", CPUFREQ_NAME_LEN)) {
*policy = CPUFREQ_POLICY_PERFORMANCE; *policy = CPUFREQ_POLICY_PERFORMANCE;
err = 0; return 0;
} else if (!strncasecmp(str_governor, "powersave", }
CPUFREQ_NAME_LEN)) {
if (!strncasecmp(str_governor, "powersave", CPUFREQ_NAME_LEN)) {
*policy = CPUFREQ_POLICY_POWERSAVE; *policy = CPUFREQ_POLICY_POWERSAVE;
err = 0; return 0;
} }
} else { } else {
struct cpufreq_governor *t; struct cpufreq_governor *t;
@ -621,26 +620,29 @@ static int cpufreq_parse_governor(char *str_governor, unsigned int *policy,
mutex_lock(&cpufreq_governor_mutex); mutex_lock(&cpufreq_governor_mutex);
t = find_governor(str_governor); t = find_governor(str_governor);
if (!t) {
if (t == NULL) {
int ret; int ret;
mutex_unlock(&cpufreq_governor_mutex); mutex_unlock(&cpufreq_governor_mutex);
ret = request_module("cpufreq_%s", str_governor); ret = request_module("cpufreq_%s", str_governor);
if (ret)
return -EINVAL;
mutex_lock(&cpufreq_governor_mutex); mutex_lock(&cpufreq_governor_mutex);
if (ret == 0) t = find_governor(str_governor);
t = find_governor(str_governor);
}
if (t != NULL) {
*governor = t;
err = 0;
} }
mutex_unlock(&cpufreq_governor_mutex); mutex_unlock(&cpufreq_governor_mutex);
if (t) {
*governor = t;
return 0;
}
} }
return err;
return -EINVAL;
} }
/** /**