diff options
| -rw-r--r-- | drivers/cpufreq/cpufreq_conservative.c | 13 | ||||
| -rw-r--r-- | drivers/cpufreq/cpufreq_ondemand.c | 13 |
2 files changed, 0 insertions, 26 deletions
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index 4531c46028cd..c80b80d48644 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c @@ -162,21 +162,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 */ @@ -213,10 +204,8 @@ 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 ***/ @@ -362,7 +351,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, @@ -403,7 +391,6 @@ 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, diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index 059179db1985..9dbb76397465 100644 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c @@ -235,21 +235,12 @@ static void ondemand_powersave_bias_init(void) /************************** sysfs interface ************************/ -static ssize_t show_sampling_rate_max(struct kobject *kobj, - struct attribute *attr, char *buf) -{ - printk_once(KERN_INFO "CPUFREQ: ondemand 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_ondemand Governor Tunables */ @@ -285,10 +276,8 @@ show_one_old(up_threshold); show_one_old(ignore_nice_load); show_one_old(powersave_bias); 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 ***/ @@ -433,7 +422,6 @@ define_one_global_rw(ignore_nice_load); define_one_global_rw(powersave_bias); static struct attribute *dbs_attributes[] = { - &sampling_rate_max.attr, &sampling_rate_min.attr, &sampling_rate.attr, &up_threshold.attr, @@ -470,7 +458,6 @@ cpufreq_freq_attr_rw_old(ignore_nice_load); cpufreq_freq_attr_rw_old(powersave_bias); static struct attribute *dbs_attributes_old[] = { - &sampling_rate_max_old.attr, &sampling_rate_min_old.attr, &sampling_rate_old.attr, &up_threshold_old.attr, |