Commit ffac80e9 authored by Venkatesh Pallipadi's avatar Venkatesh Pallipadi Committed by Dave Jones

[CPUFREQ] Misc cleanups in ondemand.

Misc cleanups in ondemand. Should have zero functional impact.
Also adding Alexey as author.
Signed-off-by: default avatarAlexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent 2f8a835c
...@@ -12,22 +12,11 @@ ...@@ -12,22 +12,11 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/smp.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/ctype.h>
#include <linux/cpufreq.h> #include <linux/cpufreq.h>
#include <linux/sysctl.h>
#include <linux/types.h>
#include <linux/fs.h>
#include <linux/sysfs.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/sched.h>
#include <linux/kmod.h>
#include <linux/workqueue.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/kernel_stat.h> #include <linux/kernel_stat.h>
#include <linux/percpu.h>
#include <linux/mutex.h> #include <linux/mutex.h>
/* /*
...@@ -79,8 +68,7 @@ static unsigned int dbs_enable; /* number of CPUs using this policy */ ...@@ -79,8 +68,7 @@ static unsigned int dbs_enable; /* number of CPUs using this policy */
* cpu_hotplug lock should be taken before that. Note that cpu_hotplug lock * cpu_hotplug lock should be taken before that. Note that cpu_hotplug lock
* is recursive for the same process. -Venki * is recursive for the same process. -Venki
*/ */
static DEFINE_MUTEX (dbs_mutex); static DEFINE_MUTEX(dbs_mutex);
static DECLARE_WORK (dbs_work, do_dbs_timer, NULL);
static struct workqueue_struct *kondemand_wq; static struct workqueue_struct *kondemand_wq;
...@@ -142,7 +130,7 @@ static ssize_t store_sampling_rate(struct cpufreq_policy *unused, ...@@ -142,7 +130,7 @@ static ssize_t store_sampling_rate(struct cpufreq_policy *unused,
{ {
unsigned int input; unsigned int input;
int ret; int ret;
ret = sscanf (buf, "%u", &input); ret = sscanf(buf, "%u", &input);
mutex_lock(&dbs_mutex); mutex_lock(&dbs_mutex);
if (ret != 1 || input > MAX_SAMPLING_RATE || input < MIN_SAMPLING_RATE) { if (ret != 1 || input > MAX_SAMPLING_RATE || input < MIN_SAMPLING_RATE) {
...@@ -161,7 +149,7 @@ static ssize_t store_up_threshold(struct cpufreq_policy *unused, ...@@ -161,7 +149,7 @@ static ssize_t store_up_threshold(struct cpufreq_policy *unused,
{ {
unsigned int input; unsigned int input;
int ret; int ret;
ret = sscanf (buf, "%u", &input); ret = sscanf(buf, "%u", &input);
mutex_lock(&dbs_mutex); mutex_lock(&dbs_mutex);
if (ret != 1 || input > MAX_FREQUENCY_UP_THRESHOLD || if (ret != 1 || input > MAX_FREQUENCY_UP_THRESHOLD ||
...@@ -184,7 +172,7 @@ static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy, ...@@ -184,7 +172,7 @@ static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy,
unsigned int j; unsigned int j;
ret = sscanf (buf, "%u", &input); ret = sscanf(buf, "%u", &input);
if ( ret != 1 ) if ( ret != 1 )
return -EINVAL; return -EINVAL;
...@@ -349,8 +337,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy, ...@@ -349,8 +337,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
switch (event) { switch (event) {
case CPUFREQ_GOV_START: case CPUFREQ_GOV_START:
if ((!cpu_online(cpu)) || if ((!cpu_online(cpu)) || (!policy->cur))
(!policy->cur))
return -EINVAL; return -EINVAL;
if (policy->cpuinfo.transition_latency > if (policy->cpuinfo.transition_latency >
...@@ -424,13 +411,13 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy, ...@@ -424,13 +411,13 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
lock_cpu_hotplug(); lock_cpu_hotplug();
mutex_lock(&dbs_mutex); mutex_lock(&dbs_mutex);
if (policy->max < this_dbs_info->cur_policy->cur) if (policy->max < this_dbs_info->cur_policy->cur)
__cpufreq_driver_target( __cpufreq_driver_target(this_dbs_info->cur_policy,
this_dbs_info->cur_policy, policy->max,
policy->max, CPUFREQ_RELATION_H); CPUFREQ_RELATION_H);
else if (policy->min > this_dbs_info->cur_policy->cur) else if (policy->min > this_dbs_info->cur_policy->cur)
__cpufreq_driver_target( __cpufreq_driver_target(this_dbs_info->cur_policy,
this_dbs_info->cur_policy, policy->min,
policy->min, CPUFREQ_RELATION_L); CPUFREQ_RELATION_L);
mutex_unlock(&dbs_mutex); mutex_unlock(&dbs_mutex);
unlock_cpu_hotplug(); unlock_cpu_hotplug();
break; break;
...@@ -439,9 +426,9 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy, ...@@ -439,9 +426,9 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
} }
static struct cpufreq_governor cpufreq_gov_dbs = { static struct cpufreq_governor cpufreq_gov_dbs = {
.name = "ondemand", .name = "ondemand",
.governor = cpufreq_governor_dbs, .governor = cpufreq_governor_dbs,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int __init cpufreq_gov_dbs_init(void) static int __init cpufreq_gov_dbs_init(void)
...@@ -455,10 +442,11 @@ static void __exit cpufreq_gov_dbs_exit(void) ...@@ -455,10 +442,11 @@ static void __exit cpufreq_gov_dbs_exit(void)
} }
MODULE_AUTHOR ("Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>"); MODULE_AUTHOR("Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>");
MODULE_DESCRIPTION ("'cpufreq_ondemand' - A dynamic cpufreq governor for " MODULE_AUTHOR("Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>");
"Low Latency Frequency Transition capable processors"); MODULE_DESCRIPTION("'cpufreq_ondemand' - A dynamic cpufreq governor for "
MODULE_LICENSE ("GPL"); "Low Latency Frequency Transition capable processors");
MODULE_LICENSE("GPL");
module_init(cpufreq_gov_dbs_init); module_init(cpufreq_gov_dbs_init);
module_exit(cpufreq_gov_dbs_exit); module_exit(cpufreq_gov_dbs_exit);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment