diff options
Diffstat (limited to 'kernel/power/main.c')
-rw-r--r-- | kernel/power/main.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index c74a56436d8b..32147b57c3bf 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
@@ -332,27 +332,6 @@ static ssize_t state_store(struct kset *kset, const char *buf, size_t n) | |||
332 | 332 | ||
333 | power_attr(state); | 333 | power_attr(state); |
334 | 334 | ||
335 | unsigned long s2ram_beep = 0; | ||
336 | |||
337 | static ssize_t s2ram_beep_show(struct kset *kset, char *buf) | ||
338 | { | ||
339 | return sprintf(buf, "%d\n", s2ram_beep); | ||
340 | } | ||
341 | |||
342 | static ssize_t | ||
343 | s2ram_beep_store(struct kset *kset, const char *buf, size_t n) | ||
344 | { | ||
345 | int val; | ||
346 | |||
347 | if (sscanf(buf, "%d", &val) > 0) { | ||
348 | s2ram_beep = val; | ||
349 | return n; | ||
350 | } | ||
351 | return -EINVAL; | ||
352 | } | ||
353 | |||
354 | power_attr(s2ram_beep); | ||
355 | |||
356 | #ifdef CONFIG_PM_TRACE | 335 | #ifdef CONFIG_PM_TRACE |
357 | int pm_trace_enabled; | 336 | int pm_trace_enabled; |
358 | 337 | ||
@@ -378,13 +357,11 @@ power_attr(pm_trace); | |||
378 | static struct attribute * g[] = { | 357 | static struct attribute * g[] = { |
379 | &state_attr.attr, | 358 | &state_attr.attr, |
380 | &pm_trace_attr.attr, | 359 | &pm_trace_attr.attr, |
381 | &s2ram_beep_attr.attr, | ||
382 | NULL, | 360 | NULL, |
383 | }; | 361 | }; |
384 | #else | 362 | #else |
385 | static struct attribute * g[] = { | 363 | static struct attribute * g[] = { |
386 | &state_attr.attr, | 364 | &state_attr.attr, |
387 | &s2ram_beep_attr.attr, | ||
388 | NULL, | 365 | NULL, |
389 | }; | 366 | }; |
390 | #endif /* CONFIG_PM_TRACE */ | 367 | #endif /* CONFIG_PM_TRACE */ |