diff mbox

PM / Wakeup: Fix build warning related to the "wakeup" sysfs file

Message ID 201105070050.55235.rjw@sisk.pl (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Rafael Wysocki May 6, 2011, 10:50 p.m. UTC 
From: Rafael J. Wysocki <rjw@sisk.pl>

The "wakeup" device sysfs file is only created if CONFIG_PM_SLEEP
is set, so put it under CONFIG_PM_SLEEP and make a build warning
related to it go away.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 drivers/base/power/sysfs.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Greg Kroah-Hartman May 6, 2011, 11:53 p.m. UTC | #1 
On Sat, May 07, 2011 at 12:50:55AM +0200, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rjw@sisk.pl>
> 
> The "wakeup" device sysfs file is only created if CONFIG_PM_SLEEP
> is set, so put it under CONFIG_PM_SLEEP and make a build warning
> related to it go away.
> 
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Pavel Machek May 12, 2011, 6:17 a.m. UTC | #2 
On Sat 2011-05-07 00:50:55, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rjw@sisk.pl>
> 
> The "wakeup" device sysfs file is only created if CONFIG_PM_SLEEP
> is set, so put it under CONFIG_PM_SLEEP and make a build warning
> related to it go away.
> 
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

ack.
diff mbox

Patch

Index: linux-2.6/drivers/base/power/sysfs.c
===================================================================
--- linux-2.6.orig/drivers/base/power/sysfs.c
+++ linux-2.6/drivers/base/power/sysfs.c
@@ -212,8 +212,9 @@  static ssize_t autosuspend_delay_ms_stor
 static DEVICE_ATTR(autosuspend_delay_ms, 0644, autosuspend_delay_ms_show,
 		autosuspend_delay_ms_store);
 
-#endif
+#endif /* CONFIG_PM_RUNTIME */
 
+#ifdef CONFIG_PM_SLEEP
 static ssize_t
 wake_show(struct device * dev, struct device_attribute *attr, char * buf)
 {
@@ -248,7 +249,6 @@  wake_store(struct device * dev, struct d
 
 static DEVICE_ATTR(wakeup, 0644, wake_show, wake_store);
 
-#ifdef CONFIG_PM_SLEEP
 static ssize_t wakeup_count_show(struct device *dev,
 				struct device_attribute *attr, char *buf)
 {