aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq
diff options
context:
space:
mode:
authorThomas Renninger <trenn@suse.de>2011-03-03 15:31:26 -0500
committerDave Jones <davej@redhat.com>2011-03-16 17:54:32 -0400
commite8951251b89440644a39f2512b4f265973926b41 (patch)
treef33ec13af306e2a8bdcbf6f62e34d450c1aa2bdc /drivers/cpufreq
parentef598549b28014ec2ea7574d4e793728e0e33d02 (diff)
[CPUFREQ] Remove old, deprecated per cpu ondemand/conservative sysfs files
Marked deprecated for quite a whilte now... Signed-off-by: Thomas Renninger <trenn@suse.de> Signed-off-by: Dave Jones <davej@redhat.com> CC: cpufreq@vger.kernel.org
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r--drivers/cpufreq/cpufreq_conservative.c74
-rw-r--r--drivers/cpufreq/cpufreq_ondemand.c67
2 files changed, 0 insertions, 141 deletions
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index c80b80d48644..3182d85b3374 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -184,31 +184,6 @@ show_one(down_threshold, down_threshold);
184show_one(ignore_nice_load, ignore_nice); 184show_one(ignore_nice_load, ignore_nice);
185show_one(freq_step, freq_step); 185show_one(freq_step, freq_step);
186 186
187/*** delete after deprecation time ***/
188#define DEPRECATION_MSG(file_name) \
189 printk_once(KERN_INFO "CPUFREQ: Per core conservative sysfs " \
190 "interface is deprecated - " #file_name "\n");
191
192#define show_one_old(file_name) \
193static ssize_t show_##file_name##_old \
194(struct cpufreq_policy *unused, char *buf) \
195{ \
196 printk_once(KERN_INFO "CPUFREQ: Per core conservative sysfs " \
197 "interface is deprecated - " #file_name "\n"); \
198 return show_##file_name(NULL, NULL, buf); \
199}
200show_one_old(sampling_rate);
201show_one_old(sampling_down_factor);
202show_one_old(up_threshold);
203show_one_old(down_threshold);
204show_one_old(ignore_nice_load);
205show_one_old(freq_step);
206show_one_old(sampling_rate_min);
207
208cpufreq_freq_attr_ro_old(sampling_rate_min);
209
210/*** delete after deprecation time ***/
211
212static ssize_t store_sampling_down_factor(struct kobject *a, 187static ssize_t store_sampling_down_factor(struct kobject *a,
213 struct attribute *b, 188 struct attribute *b,
214 const char *buf, size_t count) 189 const char *buf, size_t count)
@@ -366,48 +341,6 @@ static struct attribute_group dbs_attr_group = {
366 .name = "conservative", 341 .name = "conservative",
367}; 342};
368 343
369/*** delete after deprecation time ***/
370
371#define write_one_old(file_name) \
372static ssize_t store_##file_name##_old \
373(struct cpufreq_policy *unused, const char *buf, size_t count) \
374{ \
375 printk_once(KERN_INFO "CPUFREQ: Per core conservative sysfs " \
376 "interface is deprecated - " #file_name "\n"); \
377 return store_##file_name(NULL, NULL, buf, count); \
378}
379write_one_old(sampling_rate);
380write_one_old(sampling_down_factor);
381write_one_old(up_threshold);
382write_one_old(down_threshold);
383write_one_old(ignore_nice_load);
384write_one_old(freq_step);
385
386cpufreq_freq_attr_rw_old(sampling_rate);
387cpufreq_freq_attr_rw_old(sampling_down_factor);
388cpufreq_freq_attr_rw_old(up_threshold);
389cpufreq_freq_attr_rw_old(down_threshold);
390cpufreq_freq_attr_rw_old(ignore_nice_load);
391cpufreq_freq_attr_rw_old(freq_step);
392
393static struct attribute *dbs_attributes_old[] = {
394 &sampling_rate_min_old.attr,
395 &sampling_rate_old.attr,
396 &sampling_down_factor_old.attr,
397 &up_threshold_old.attr,
398 &down_threshold_old.attr,
399 &ignore_nice_load_old.attr,
400 &freq_step_old.attr,
401 NULL
402};
403
404static struct attribute_group dbs_attr_group_old = {
405 .attrs = dbs_attributes_old,
406 .name = "conservative",
407};
408
409/*** delete after deprecation time ***/
410
411/************************** sysfs end ************************/ 344/************************** sysfs end ************************/
412 345
413static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) 346static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)
@@ -583,12 +516,6 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
583 516
584 mutex_lock(&dbs_mutex); 517 mutex_lock(&dbs_mutex);
585 518
586 rc = sysfs_create_group(&policy->kobj, &dbs_attr_group_old);
587 if (rc) {
588 mutex_unlock(&dbs_mutex);
589 return rc;
590 }
591
592 for_each_cpu(j, policy->cpus) { 519 for_each_cpu(j, policy->cpus) {
593 struct cpu_dbs_info_s *j_dbs_info; 520 struct cpu_dbs_info_s *j_dbs_info;
594 j_dbs_info = &per_cpu(cs_cpu_dbs_info, j); 521 j_dbs_info = &per_cpu(cs_cpu_dbs_info, j);
@@ -651,7 +578,6 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
651 dbs_timer_exit(this_dbs_info); 578 dbs_timer_exit(this_dbs_info);
652 579
653 mutex_lock(&dbs_mutex); 580 mutex_lock(&dbs_mutex);
654 sysfs_remove_group(&policy->kobj, &dbs_attr_group_old);
655 dbs_enable--; 581 dbs_enable--;
656 mutex_destroy(&this_dbs_info->timer_mutex); 582 mutex_destroy(&this_dbs_info->timer_mutex);
657 583
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 9dbb76397465..ba18205be12b 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -257,30 +257,6 @@ show_one(sampling_down_factor, sampling_down_factor);
257show_one(ignore_nice_load, ignore_nice); 257show_one(ignore_nice_load, ignore_nice);
258show_one(powersave_bias, powersave_bias); 258show_one(powersave_bias, powersave_bias);
259 259
260/*** delete after deprecation time ***/
261
262#define DEPRECATION_MSG(file_name) \
263 printk_once(KERN_INFO "CPUFREQ: Per core ondemand sysfs " \
264 "interface is deprecated - " #file_name "\n");
265
266#define show_one_old(file_name) \
267static ssize_t show_##file_name##_old \
268(struct cpufreq_policy *unused, char *buf) \
269{ \
270 printk_once(KERN_INFO "CPUFREQ: Per core ondemand sysfs " \
271 "interface is deprecated - " #file_name "\n"); \
272 return show_##file_name(NULL, NULL, buf); \
273}
274show_one_old(sampling_rate);
275show_one_old(up_threshold);
276show_one_old(ignore_nice_load);
277show_one_old(powersave_bias);
278show_one_old(sampling_rate_min);
279
280cpufreq_freq_attr_ro_old(sampling_rate_min);
281
282/*** delete after deprecation time ***/
283
284static ssize_t store_sampling_rate(struct kobject *a, struct attribute *b, 260static ssize_t store_sampling_rate(struct kobject *a, struct attribute *b,
285 const char *buf, size_t count) 261 const char *buf, size_t count)
286{ 262{
@@ -437,42 +413,6 @@ static struct attribute_group dbs_attr_group = {
437 .name = "ondemand", 413 .name = "ondemand",
438}; 414};
439 415
440/*** delete after deprecation time ***/
441
442#define write_one_old(file_name) \
443static ssize_t store_##file_name##_old \
444(struct cpufreq_policy *unused, const char *buf, size_t count) \
445{ \
446 printk_once(KERN_INFO "CPUFREQ: Per core ondemand sysfs " \
447 "interface is deprecated - " #file_name "\n"); \
448 return store_##file_name(NULL, NULL, buf, count); \
449}
450write_one_old(sampling_rate);
451write_one_old(up_threshold);
452write_one_old(ignore_nice_load);
453write_one_old(powersave_bias);
454
455cpufreq_freq_attr_rw_old(sampling_rate);
456cpufreq_freq_attr_rw_old(up_threshold);
457cpufreq_freq_attr_rw_old(ignore_nice_load);
458cpufreq_freq_attr_rw_old(powersave_bias);
459
460static struct attribute *dbs_attributes_old[] = {
461 &sampling_rate_min_old.attr,
462 &sampling_rate_old.attr,
463 &up_threshold_old.attr,
464 &ignore_nice_load_old.attr,
465 &powersave_bias_old.attr,
466 NULL
467};
468
469static struct attribute_group dbs_attr_group_old = {
470 .attrs = dbs_attributes_old,
471 .name = "ondemand",
472};
473
474/*** delete after deprecation time ***/
475
476/************************** sysfs end ************************/ 416/************************** sysfs end ************************/
477 417
478static void dbs_freq_increase(struct cpufreq_policy *p, unsigned int freq) 418static void dbs_freq_increase(struct cpufreq_policy *p, unsigned int freq)
@@ -719,12 +659,6 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
719 659
720 mutex_lock(&dbs_mutex); 660 mutex_lock(&dbs_mutex);
721 661
722 rc = sysfs_create_group(&policy->kobj, &dbs_attr_group_old);
723 if (rc) {
724 mutex_unlock(&dbs_mutex);
725 return rc;
726 }
727
728 dbs_enable++; 662 dbs_enable++;
729 for_each_cpu(j, policy->cpus) { 663 for_each_cpu(j, policy->cpus) {
730 struct cpu_dbs_info_s *j_dbs_info; 664 struct cpu_dbs_info_s *j_dbs_info;
@@ -777,7 +711,6 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
777 dbs_timer_exit(this_dbs_info); 711 dbs_timer_exit(this_dbs_info);
778 712
779 mutex_lock(&dbs_mutex); 713 mutex_lock(&dbs_mutex);
780 sysfs_remove_group(&policy->kobj, &dbs_attr_group_old);
781 mutex_destroy(&this_dbs_info->timer_mutex); 714 mutex_destroy(&this_dbs_info->timer_mutex);
782 dbs_enable--; 715 dbs_enable--;
783 mutex_unlock(&dbs_mutex); 716 mutex_unlock(&dbs_mutex);
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-23 03:07:04 -0500