aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorPavel Machek <pavel@suse.cz>2007-07-19 04:47:41 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 13:04:43 -0400
commit77afcf78a2ded9a91838734234949c0ead5feb12 (patch)
tree76922017855c70d550b40241f8a144f6c098cd04 /kernel/power
parent5a60d6235c8352ade8f2699e72fcdfe853730456 (diff)
PM: Integrate beeping flag with existing acpi_sleep flags
Move "debug during resume from s2ram" into the variable we already use for real-mode flags to simplify code. It also closes nasty trap for the user in acpi_sleep_setup; order of parameters actually mattered there, acpi_sleep=s3_bios,s3_mode doing something different from acpi_sleep=s3_mode,s3_bios. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/main.c23
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
333power_attr(state); 333power_attr(state);
334 334
335unsigned long s2ram_beep = 0;
336
337static ssize_t s2ram_beep_show(struct kset *kset, char *buf)
338{
339 return sprintf(buf, "%d\n", s2ram_beep);
340}
341
342static ssize_t
343s2ram_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
354power_attr(s2ram_beep);
355
356#ifdef CONFIG_PM_TRACE 335#ifdef CONFIG_PM_TRACE
357int pm_trace_enabled; 336int pm_trace_enabled;
358 337
@@ -378,13 +357,11 @@ power_attr(pm_trace);
378static struct attribute * g[] = { 357static 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
385static struct attribute * g[] = { 363static 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 */