1 files changed, 9 insertions, 136 deletions

diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index 526bfbf69611..33b56e5c5c14 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -76,13 +76,10 @@ static DEFINE_PER_CPU(struct cpu_dbs_info_s, cs_cpu_dbs_info);
 static unsigned int dbs_enable; /* number of CPUs using this policy */
 
 /*
- * dbs_mutex protects data in dbs_tuners_ins from concurrent changes on
- * different CPUs. It protects dbs_enable in governor start/stop.
+ * dbs_mutex protects dbs_enable in governor start/stop.
  */
 static DEFINE_MUTEX(dbs_mutex);
 
-static struct workqueue_struct  *kconservative_wq;
-
 static struct dbs_tuners {
         unsigned int sampling_rate;
         unsigned int sampling_down_factor;
@@ -118,7 +115,7 @@ static inline cputime64_t get_cpu_idle_time_jiffy(unsigned int cpu,
         if (wall)
                 *wall = (cputime64_t)jiffies_to_usecs(cur_wall_time);
 
-        return (cputime64_t)jiffies_to_usecs(idle_time);;
+        return (cputime64_t)jiffies_to_usecs(idle_time);
 }
 
 static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall)
@@ -164,21 +161,12 @@ static struct notifier_block dbs_cpufreq_notifier_block = {
 };
 
 /************************** sysfs interface ************************/
-static ssize_t show_sampling_rate_max(struct kobject *kobj,
-                                      struct attribute *attr, char *buf)
-{
-        printk_once(KERN_INFO "CPUFREQ: conservative sampling_rate_max "
-                    "sysfs file is deprecated - used by: %s\n", current->comm);
-        return sprintf(buf, "%u\n", -1U);
-}
-
 static ssize_t show_sampling_rate_min(struct kobject *kobj,
                                       struct attribute *attr, char *buf)
 {
         return sprintf(buf, "%u\n", min_sampling_rate);
 }
 
-define_one_global_ro(sampling_rate_max);
 define_one_global_ro(sampling_rate_min);
 
 /* cpufreq_conservative Governor Tunables */
@@ -195,33 +183,6 @@ show_one(down_threshold, down_threshold);
 show_one(ignore_nice_load, ignore_nice);
 show_one(freq_step, freq_step);
 
-/*** delete after deprecation time ***/
-#define DEPRECATION_MSG(file_name)                                      \
-        printk_once(KERN_INFO "CPUFREQ: Per core conservative sysfs "   \
-                "interface is deprecated - " #file_name "\n");
-
-#define show_one_old(file_name)                                         \
-static ssize_t show_##file_name##_old                                   \
-(struct cpufreq_policy *unused, char *buf)                              \
-{                                                                       \
-        printk_once(KERN_INFO "CPUFREQ: Per core conservative sysfs "   \
-                "interface is deprecated - " #file_name "\n");          \
-        return show_##file_name(NULL, NULL, buf);                       \
-}
-show_one_old(sampling_rate);
-show_one_old(sampling_down_factor);
-show_one_old(up_threshold);
-show_one_old(down_threshold);
-show_one_old(ignore_nice_load);
-show_one_old(freq_step);
-show_one_old(sampling_rate_min);
-show_one_old(sampling_rate_max);
-
-cpufreq_freq_attr_ro_old(sampling_rate_min);
-cpufreq_freq_attr_ro_old(sampling_rate_max);
-
-/*** delete after deprecation time ***/
-
 static ssize_t store_sampling_down_factor(struct kobject *a,
                                           struct attribute *b,
                                           const char *buf, size_t count)
@@ -233,10 +194,7 @@ static ssize_t store_sampling_down_factor(struct kobject *a,
         if (ret != 1 || input > MAX_SAMPLING_DOWN_FACTOR || input < 1)
                 return -EINVAL;
 
-        mutex_lock(&dbs_mutex);
         dbs_tuners_ins.sampling_down_factor = input;
-        mutex_unlock(&dbs_mutex);
-
         return count;
 }
 
@@ -250,10 +208,7 @@ static ssize_t store_sampling_rate(struct kobject *a, struct attribute *b,
         if (ret != 1)
                 return -EINVAL;
 
-        mutex_lock(&dbs_mutex);
         dbs_tuners_ins.sampling_rate = max(input, min_sampling_rate);
-        mutex_unlock(&dbs_mutex);
-
         return count;
 }
 
@@ -264,16 +219,11 @@ static ssize_t store_up_threshold(struct kobject *a, struct attribute *b,
         int ret;
         ret = sscanf(buf, "%u", &input);
 
-        mutex_lock(&dbs_mutex);
         if (ret != 1 || input > 100 ||
-                        input <= dbs_tuners_ins.down_threshold) {
-                mutex_unlock(&dbs_mutex);
+                        input <= dbs_tuners_ins.down_threshold)
                 return -EINVAL;
-        }
 
         dbs_tuners_ins.up_threshold = input;
-        mutex_unlock(&dbs_mutex);
-
         return count;
 }
 
@@ -284,17 +234,12 @@ static ssize_t store_down_threshold(struct kobject *a, struct attribute *b,
         int ret;
         ret = sscanf(buf, "%u", &input);
 
-        mutex_lock(&dbs_mutex);
         /* cannot be lower than 11 otherwise freq will not fall */
         if (ret != 1 || input < 11 || input > 100 ||
-                        input >= dbs_tuners_ins.up_threshold) {
-                mutex_unlock(&dbs_mutex);
+                        input >= dbs_tuners_ins.up_threshold)
                 return -EINVAL;
-        }
 
         dbs_tuners_ins.down_threshold = input;
-        mutex_unlock(&dbs_mutex);
-
         return count;
 }
 
@@ -313,11 +258,9 @@ static ssize_t store_ignore_nice_load(struct kobject *a, struct attribute *b,
         if (input > 1)
                 input = 1;
 
-        mutex_lock(&dbs_mutex);
-        if (input == dbs_tuners_ins.ignore_nice) { /* nothing to do */
-                mutex_unlock(&dbs_mutex);
+        if (input == dbs_tuners_ins.ignore_nice) /* nothing to do */
                 return count;
-        }
+
         dbs_tuners_ins.ignore_nice = input;
 
         /* we need to re-evaluate prev_cpu_idle */
@@ -329,8 +272,6 @@ static ssize_t store_ignore_nice_load(struct kobject *a, struct attribute *b,
                 if (dbs_tuners_ins.ignore_nice)
                         dbs_info->prev_cpu_nice = kstat_cpu(j).cpustat.nice;
         }
-        mutex_unlock(&dbs_mutex);
-
         return count;
 }
 
@@ -349,10 +290,7 @@ static ssize_t store_freq_step(struct kobject *a, struct attribute *b,
 
         /* no need to test here if freq_step is zero as the user might actually
          * want this, they would be crazy though :) */
-        mutex_lock(&dbs_mutex);
         dbs_tuners_ins.freq_step = input;
-        mutex_unlock(&dbs_mutex);
-
         return count;
 }
 
@@ -364,7 +302,6 @@ define_one_global_rw(ignore_nice_load);
 define_one_global_rw(freq_step);
 
 static struct attribute *dbs_attributes[] = {
-        &sampling_rate_max.attr,
         &sampling_rate_min.attr,
         &sampling_rate.attr,
         &sampling_down_factor.attr,
@@ -380,49 +317,6 @@ static struct attribute_group dbs_attr_group = {
         .name = "conservative",
 };
 
-/*** delete after deprecation time ***/
-
-#define write_one_old(file_name)                                        \
-static ssize_t store_##file_name##_old                                  \
-(struct cpufreq_policy *unused, const char *buf, size_t count)          \
-{                                                                       \
-        printk_once(KERN_INFO "CPUFREQ: Per core conservative sysfs "   \
-                "interface is deprecated - " #file_name "\n");  \
-        return store_##file_name(NULL, NULL, buf, count);               \
-}
-write_one_old(sampling_rate);
-write_one_old(sampling_down_factor);
-write_one_old(up_threshold);
-write_one_old(down_threshold);
-write_one_old(ignore_nice_load);
-write_one_old(freq_step);
-
-cpufreq_freq_attr_rw_old(sampling_rate);
-cpufreq_freq_attr_rw_old(sampling_down_factor);
-cpufreq_freq_attr_rw_old(up_threshold);
-cpufreq_freq_attr_rw_old(down_threshold);
-cpufreq_freq_attr_rw_old(ignore_nice_load);
-cpufreq_freq_attr_rw_old(freq_step);
-
-static struct attribute *dbs_attributes_old[] = {
-        &sampling_rate_max_old.attr,
-        &sampling_rate_min_old.attr,
-        &sampling_rate_old.attr,
-        &sampling_down_factor_old.attr,
-        &up_threshold_old.attr,
-        &down_threshold_old.attr,
-        &ignore_nice_load_old.attr,
-        &freq_step_old.attr,
-        NULL
-};
-
-static struct attribute_group dbs_attr_group_old = {
-        .attrs = dbs_attributes_old,
-        .name = "conservative",
-};
-
-/*** delete after deprecation time ***/
-
 /************************** sysfs end ************************/
 
 static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)
@@ -560,7 +454,7 @@ static void do_dbs_timer(struct work_struct *work)
 
         dbs_check_cpu(dbs_info);
 
-        queue_delayed_work_on(cpu, kconservative_wq, &dbs_info->work, delay);
+        schedule_delayed_work_on(cpu, &dbs_info->work, delay);
         mutex_unlock(&dbs_info->timer_mutex);
 }
 
@@ -572,8 +466,7 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
 
         dbs_info->enable = 1;
         INIT_DELAYED_WORK_DEFERRABLE(&dbs_info->work, do_dbs_timer);
-        queue_delayed_work_on(dbs_info->cpu, kconservative_wq, &dbs_info->work,
-                                delay);
+        schedule_delayed_work_on(dbs_info->cpu, &dbs_info->work, delay);
 }
 
 static inline void dbs_timer_exit(struct cpu_dbs_info_s *dbs_info)
@@ -599,12 +492,6 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
 
                 mutex_lock(&dbs_mutex);
 
-                rc = sysfs_create_group(&policy->kobj, &dbs_attr_group_old);
-                if (rc) {
-                        mutex_unlock(&dbs_mutex);
-                        return rc;
-                }
-
                 for_each_cpu(j, policy->cpus) {
                         struct cpu_dbs_info_s *j_dbs_info;
                         j_dbs_info = &per_cpu(cs_cpu_dbs_info, j);
@@ -667,7 +554,6 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                 dbs_timer_exit(this_dbs_info);
 
                 mutex_lock(&dbs_mutex);
-                sysfs_remove_group(&policy->kobj, &dbs_attr_group_old);
                 dbs_enable--;
                 mutex_destroy(&this_dbs_info->timer_mutex);
 
@@ -716,25 +602,12 @@ struct cpufreq_governor cpufreq_gov_conservative = {
 
 static int __init cpufreq_gov_dbs_init(void)
 {
-        int err;
-
-        kconservative_wq = create_workqueue("kconservative");
-        if (!kconservative_wq) {
-                printk(KERN_ERR "Creation of kconservative failed\n");
-                return -EFAULT;
-        }
-
-        err = cpufreq_register_governor(&cpufreq_gov_conservative);
-        if (err)
-                destroy_workqueue(kconservative_wq);
-
-        return err;
+        return cpufreq_register_governor(&cpufreq_gov_conservative);
 }
 
 static void __exit cpufreq_gov_dbs_exit(void)
 {
         cpufreq_unregister_governor(&cpufreq_gov_conservative);
-        destroy_workqueue(kconservative_wq);
 }