xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpufreq: acpi-cpufreq: Simplify boost-related code

Browse Source 
The store_boost() routine is only used by store_cpb(), so move
the code from it directly to that function and rename _store_boost()
to set_boost() to make its name reflect the name of the driver
callback pointing to it.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
This commit is contained in:
Rafael J. Wysocki
2015-12-27 00:25:35 +01:00
parent 41669da030
commit 17135782b8
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/cpufreq/acpi-cpufreq.c
View File

@@ -135,7 +135,7 @@ static void boost_set_msrs(bool enable, const struct cpumask *cpumask)
wrmsr_on_cpus(cpumask, msr_addr, msrs); wrmsr_on_cpus(cpumask, msr_addr, msrs);
} }
static int _store_boost(int val) static int set_boost(int val)
{ {
get_online_cpus(); get_online_cpus();
boost_set_msrs(val, cpu_online_mask); boost_set_msrs(val, cpu_online_mask);
@@ -158,29 +158,24 @@ static ssize_t show_freqdomain_cpus(struct cpufreq_policy *policy, char *buf)
cpufreq_freq_attr_ro(freqdomain_cpus); cpufreq_freq_attr_ro(freqdomain_cpus);
#ifdef CONFIG_X86_ACPI_CPUFREQ_CPB #ifdef CONFIG_X86_ACPI_CPUFREQ_CPB
static ssize_t store_boost(const char *buf, size_t count) static ssize_t store_cpb(struct cpufreq_policy *policy, const char *buf,
size_t count)
{ {
int ret; int ret;
unsigned long val = 0; unsigned int val = 0;
if (!acpi_cpufreq_driver.boost_supported) if (!acpi_cpufreq_driver.boost_supported)
return -EINVAL; return -EINVAL;
ret = kstrtoul(buf, 10, &val); ret = kstrtouint(buf, 10, &val);
if (ret || (val > 1)) if (ret || val > 1)
return -EINVAL; return -EINVAL;
_store_boost((int) val); set_boost(val);
return count; return count;
} }
static ssize_t store_cpb(struct cpufreq_policy *policy, const char *buf,
size_t count)
{
return store_boost(buf, count);
}
static ssize_t show_cpb(struct cpufreq_policy *policy, char *buf) static ssize_t show_cpb(struct cpufreq_policy *policy, char *buf)
{ {
return sprintf(buf, "%u\n", acpi_cpufreq_driver.boost_enabled); return sprintf(buf, "%u\n", acpi_cpufreq_driver.boost_enabled);
@@ -905,7 +900,7 @@ static struct cpufreq_driver acpi_cpufreq_driver = {
.resume = acpi_cpufreq_resume, .resume = acpi_cpufreq_resume,
.name = "acpi-cpufreq", .name = "acpi-cpufreq",
.attr = acpi_cpufreq_attr, .attr = acpi_cpufreq_attr,
.set_boost = _store_boost, .set_boost = set_boost,
}; };
static void __init acpi_cpufreq_boost_init(void) static void __init acpi_cpufreq_boost_init(void)