| Message ID | 4E02C93A.7010601@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thursday, June 23, 2011, Cong Wang wrote: > ? 2011?06?23? 03:49, Rafael J. Wysocki ??: > >> +#ifdef CONFIG_PM > >> > +#include<linux/suspend.h> > >> > +#endif > > I don't think the #ifdef in necessary. Any dependencies on CONFIG_PM > > (or CONFIG_SUSPEND etc.) should be taken care of inside of suspend.h. > > This file should be fixed if they aren't. > > > > Ok, please check the updated version below. That's fine by me. Please feel free to add my ACK to the patch. Thanks, Rafael -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu 2011-06-23 13:03:54, Cong Wang wrote: > ??? 2011???06???23??? 03:49, Rafael J. Wysocki ??????: > >>+#ifdef CONFIG_PM > >>> +#include<linux/suspend.h> > >>> +#endif > >I don't think the #ifdef in necessary. Any dependencies on CONFIG_PM > >(or CONFIG_SUSPEND etc.) should be taken care of inside of suspend.h. > >This file should be fixed if they aren't. > > > > Ok, please check the updated version below. > > Thanks. > > Author: Amerigo Wang <amwang@redhat.com> > > pm: move pm notifiers into suspend.h > > Signed-off-by: WANG Cong <amwang@redhat.com> ACK.
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 68091dd..503dbc9 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -23,6 +23,7 @@ #include <linux/log2.h> #include <linux/regulator/consumer.h> #include <linux/pm_runtime.h> +#include <linux/suspend.h> #include <linux/mmc/card.h> #include <linux/mmc/host.h> diff --git a/include/linux/notifier.h b/include/linux/notifier.h index 145c436..ae8f7d9 100644 --- a/include/linux/notifier.h +++ b/include/linux/notifier.h @@ -191,15 +191,9 @@ static inline int notifier_to_errno(int ret) /* reboot notifiers are defined in include/linux/reboot.h. */ -#define NETLINK_URELEASE 0x0001 /* Unicast netlink socket released */ +/* Hibernation and suspend events are defined in include/linux/suspend.h. */ -/* Hibernation and suspend events */ -#define PM_HIBERNATION_PREPARE 0x0001 /* Going to hibernate */ -#define PM_POST_HIBERNATION 0x0002 /* Hibernation finished */ -#define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */ -#define PM_POST_SUSPEND 0x0004 /* Suspend finished */ -#define PM_RESTORE_PREPARE 0x0005 /* Going to restore a saved image */ -#define PM_POST_RESTORE 0x0006 /* Restore failed */ +#define NETLINK_URELEASE 0x0001 /* Unicast netlink socket released */ /* Console keyboard events. * Note: KBD_KEYCODE is always sent before KBD_UNBOUND_KEYCODE, KBD_UNICODE and diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 083ffea..95bc81c 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -260,6 +260,14 @@ static inline int hibernate(void) { return -ENOSYS; } static inline bool system_entering_hibernation(void) { return false; } #endif /* CONFIG_HIBERNATION */ +/* Hibernation and suspend events */ +#define PM_HIBERNATION_PREPARE 0x0001 /* Going to hibernate */ +#define PM_POST_HIBERNATION 0x0002 /* Hibernation finished */ +#define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */ +#define PM_POST_SUSPEND 0x0004 /* Suspend finished */ +#define PM_RESTORE_PREPARE 0x0005 /* Going to restore a saved image */ +#define PM_POST_RESTORE 0x0006 /* Restore failed */ + #ifdef CONFIG_PM_SLEEP void save_processor_state(void); void restore_processor_state(void);