* [PATCH] PM / Wakeup: Fix build warning related to the "wakeup" sysfs file
@ 2011-05-06 22:50 Rafael J. Wysocki
0 siblings, 0 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2011-05-06 22:50 UTC (permalink / raw)
To: Linux PM mailing list; +Cc: Greg Kroah-Hartman, LKML
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(-)
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)
{
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] PM / Wakeup: Fix build warning related to the "wakeup" sysfs file
2011-05-06 22:50 Rafael J. Wysocki
2011-05-06 23:53 ` Greg KH
2011-05-06 23:53 ` Greg KH
@ 2011-05-12 6:17 ` Pavel Machek
2011-05-12 6:17 ` Pavel Machek
3 siblings, 0 replies; 6+ messages in thread
From: Pavel Machek @ 2011-05-12 6:17 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Linux PM mailing list, LKML, Greg Kroah-Hartman
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.
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] PM / Wakeup: Fix build warning related to the "wakeup" sysfs file
2011-05-06 22:50 Rafael J. Wysocki
` (2 preceding siblings ...)
2011-05-12 6:17 ` Pavel Machek
@ 2011-05-12 6:17 ` Pavel Machek
3 siblings, 0 replies; 6+ messages in thread
From: Pavel Machek @ 2011-05-12 6:17 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Linux PM mailing list, Greg Kroah-Hartman, LKML
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.
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] PM / Wakeup: Fix build warning related to the "wakeup" sysfs file
2011-05-06 22:50 Rafael J. Wysocki
@ 2011-05-06 23:53 ` Greg KH
2011-05-06 23:53 ` Greg KH
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2011-05-06 23:53 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Linux PM mailing list, LKML
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>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] PM / Wakeup: Fix build warning related to the "wakeup" sysfs file
2011-05-06 22:50 Rafael J. Wysocki
2011-05-06 23:53 ` Greg KH
@ 2011-05-06 23:53 ` Greg KH
2011-05-12 6:17 ` Pavel Machek
2011-05-12 6:17 ` Pavel Machek
3 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2011-05-06 23:53 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Linux PM mailing list, LKML
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>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] PM / Wakeup: Fix build warning related to the "wakeup" sysfs file
@ 2011-05-06 22:50 Rafael J. Wysocki
2011-05-06 23:53 ` Greg KH
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2011-05-06 22:50 UTC (permalink / raw)
To: Linux PM mailing list; +Cc: LKML, Greg Kroah-Hartman
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(-)
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)
{
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-05-12 6:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-06 22:50 [PATCH] PM / Wakeup: Fix build warning related to the "wakeup" sysfs file Rafael J. Wysocki
2011-05-06 22:50 Rafael J. Wysocki
2011-05-06 23:53 ` Greg KH
2011-05-06 23:53 ` Greg KH
2011-05-12 6:17 ` Pavel Machek
2011-05-12 6:17 ` Pavel Machek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.