diff options
author | Thomas Renninger <trenn@suse.de> | 2011-03-03 15:31:25 -0500 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2011-03-16 17:54:32 -0400 |
commit | ef598549b28014ec2ea7574d4e793728e0e33d02 (patch) | |
tree | c3ecb7f91f2130f4b9c0c7a602c3dd07e57106bd /drivers | |
parent | 9e91869544fc831d640cae1ffd0313b38657b593 (diff) |
[CPUFREQ] Remove deprecated sysfs file sampling_rate_max
Marked deprecated for quite a while 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')
-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 = { | |||
162 | }; | 162 | }; |
163 | 163 | ||
164 | /************************** sysfs interface ************************/ | 164 | /************************** sysfs interface ************************/ |
165 | static ssize_t show_sampling_rate_max(struct kobject *kobj, | ||
166 | struct attribute *attr, char *buf) | ||
167 | { | ||
168 | printk_once(KERN_INFO "CPUFREQ: conservative sampling_rate_max " | ||
169 | "sysfs file is deprecated - used by: %s\n", current->comm); | ||
170 | return sprintf(buf, "%u\n", -1U); | ||
171 | } | ||
172 | |||
173 | static ssize_t show_sampling_rate_min(struct kobject *kobj, | 165 | static ssize_t show_sampling_rate_min(struct kobject *kobj, |
174 | struct attribute *attr, char *buf) | 166 | struct attribute *attr, char *buf) |
175 | { | 167 | { |
176 | return sprintf(buf, "%u\n", min_sampling_rate); | 168 | return sprintf(buf, "%u\n", min_sampling_rate); |
177 | } | 169 | } |
178 | 170 | ||
179 | define_one_global_ro(sampling_rate_max); | ||
180 | define_one_global_ro(sampling_rate_min); | 171 | define_one_global_ro(sampling_rate_min); |
181 | 172 | ||
182 | /* cpufreq_conservative Governor Tunables */ | 173 | /* cpufreq_conservative Governor Tunables */ |
@@ -213,10 +204,8 @@ show_one_old(down_threshold); | |||
213 | show_one_old(ignore_nice_load); | 204 | show_one_old(ignore_nice_load); |
214 | show_one_old(freq_step); | 205 | show_one_old(freq_step); |
215 | show_one_old(sampling_rate_min); | 206 | show_one_old(sampling_rate_min); |
216 | show_one_old(sampling_rate_max); | ||
217 | 207 | ||
218 | cpufreq_freq_attr_ro_old(sampling_rate_min); | 208 | cpufreq_freq_attr_ro_old(sampling_rate_min); |
219 | cpufreq_freq_attr_ro_old(sampling_rate_max); | ||
220 | 209 | ||
221 | /*** delete after deprecation time ***/ | 210 | /*** delete after deprecation time ***/ |
222 | 211 | ||
@@ -362,7 +351,6 @@ define_one_global_rw(ignore_nice_load); | |||
362 | define_one_global_rw(freq_step); | 351 | define_one_global_rw(freq_step); |
363 | 352 | ||
364 | static struct attribute *dbs_attributes[] = { | 353 | static struct attribute *dbs_attributes[] = { |
365 | &sampling_rate_max.attr, | ||
366 | &sampling_rate_min.attr, | 354 | &sampling_rate_min.attr, |
367 | &sampling_rate.attr, | 355 | &sampling_rate.attr, |
368 | &sampling_down_factor.attr, | 356 | &sampling_down_factor.attr, |
@@ -403,7 +391,6 @@ cpufreq_freq_attr_rw_old(ignore_nice_load); | |||
403 | cpufreq_freq_attr_rw_old(freq_step); | 391 | cpufreq_freq_attr_rw_old(freq_step); |
404 | 392 | ||
405 | static struct attribute *dbs_attributes_old[] = { | 393 | static struct attribute *dbs_attributes_old[] = { |
406 | &sampling_rate_max_old.attr, | ||
407 | &sampling_rate_min_old.attr, | 394 | &sampling_rate_min_old.attr, |
408 | &sampling_rate_old.attr, | 395 | &sampling_rate_old.attr, |
409 | &sampling_down_factor_old.attr, | 396 | &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) | |||
235 | 235 | ||
236 | /************************** sysfs interface ************************/ | 236 | /************************** sysfs interface ************************/ |
237 | 237 | ||
238 | static ssize_t show_sampling_rate_max(struct kobject *kobj, | ||
239 | struct attribute *attr, char *buf) | ||
240 | { | ||
241 | printk_once(KERN_INFO "CPUFREQ: ondemand sampling_rate_max " | ||
242 | "sysfs file is deprecated - used by: %s\n", current->comm); | ||
243 | return sprintf(buf, "%u\n", -1U); | ||
244 | } | ||
245 | |||
246 | static ssize_t show_sampling_rate_min(struct kobject *kobj, | 238 | static ssize_t show_sampling_rate_min(struct kobject *kobj, |
247 | struct attribute *attr, char *buf) | 239 | struct attribute *attr, char *buf) |
248 | { | 240 | { |
249 | return sprintf(buf, "%u\n", min_sampling_rate); | 241 | return sprintf(buf, "%u\n", min_sampling_rate); |
250 | } | 242 | } |
251 | 243 | ||
252 | define_one_global_ro(sampling_rate_max); | ||
253 | define_one_global_ro(sampling_rate_min); | 244 | define_one_global_ro(sampling_rate_min); |
254 | 245 | ||
255 | /* cpufreq_ondemand Governor Tunables */ | 246 | /* cpufreq_ondemand Governor Tunables */ |
@@ -285,10 +276,8 @@ show_one_old(up_threshold); | |||
285 | show_one_old(ignore_nice_load); | 276 | show_one_old(ignore_nice_load); |
286 | show_one_old(powersave_bias); | 277 | show_one_old(powersave_bias); |
287 | show_one_old(sampling_rate_min); | 278 | show_one_old(sampling_rate_min); |
288 | show_one_old(sampling_rate_max); | ||
289 | 279 | ||
290 | cpufreq_freq_attr_ro_old(sampling_rate_min); | 280 | cpufreq_freq_attr_ro_old(sampling_rate_min); |
291 | cpufreq_freq_attr_ro_old(sampling_rate_max); | ||
292 | 281 | ||
293 | /*** delete after deprecation time ***/ | 282 | /*** delete after deprecation time ***/ |
294 | 283 | ||
@@ -433,7 +422,6 @@ define_one_global_rw(ignore_nice_load); | |||
433 | define_one_global_rw(powersave_bias); | 422 | define_one_global_rw(powersave_bias); |
434 | 423 | ||
435 | static struct attribute *dbs_attributes[] = { | 424 | static struct attribute *dbs_attributes[] = { |
436 | &sampling_rate_max.attr, | ||
437 | &sampling_rate_min.attr, | 425 | &sampling_rate_min.attr, |
438 | &sampling_rate.attr, | 426 | &sampling_rate.attr, |
439 | &up_threshold.attr, | 427 | &up_threshold.attr, |
@@ -470,7 +458,6 @@ cpufreq_freq_attr_rw_old(ignore_nice_load); | |||
470 | cpufreq_freq_attr_rw_old(powersave_bias); | 458 | cpufreq_freq_attr_rw_old(powersave_bias); |
471 | 459 | ||
472 | static struct attribute *dbs_attributes_old[] = { | 460 | static struct attribute *dbs_attributes_old[] = { |
473 | &sampling_rate_max_old.attr, | ||
474 | &sampling_rate_min_old.attr, | 461 | &sampling_rate_min_old.attr, |
475 | &sampling_rate_old.attr, | 462 | &sampling_rate_old.attr, |
476 | &up_threshold_old.attr, | 463 | &up_threshold_old.attr, |