From mboxrd@z Thu Jan 1 00:00:00 1970 From: Amerigo Wang Subject: [PATCH 4/5] pm: move pm notifiers into suspend.h Date: Wed, 22 Jun 2011 14:35:21 +0800 Message-ID: <1308724522-32461-5-git-send-email-amwang__26621.3187286214$1308724789$gmane$org@redhat.com> References: <1308724522-32461-1-git-send-email-amwang@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1308724522-32461-1-git-send-email-amwang@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org To: linux-kernel@vger.kernel.org Cc: Len Brown , Philip Rakity , Amerigo Wang , Lucas De Marchi , netdev@vger.kernel.org, linux-mmc@vger.kernel.org, Josh Triplett , linux-pm@lists.linux-foundation.org, "Paul E. McKenney" , akpm@linux-foundation.org, Chris Ball , "David S. Miller" List-Id: linux-pm@vger.kernel.org It is not necessary to share the same notifier.h. Signed-off-by: WANG Cong --- drivers/mmc/core/core.c | 3 +++ include/linux/notifier.h | 10 ++-------- include/linux/suspend.h | 8 ++++++++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 68091dd..2cd4ec5 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -23,6 +23,9 @@ #include #include #include +#ifdef CONFIG_PM +#include +#endif #include #include 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); -- 1.7.4.4