notifiers: pm: move pm notifiers into suspend.h

It is not necessary to share the same notifier.h.

Change-Id: Icb098842df77e217d15cb4609e181ad9945983ff
Signed-off-by: WANG Cong <amwang@redhat.com>
Cc: David Miller <davem@davemloft.net>
Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 0a40407..2ae76cd 100644 (file)
--- 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/wakelock.h>
 
 #include <linux/mmc/card.h>

diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index c0688b0..e0b001e 100644 (file)
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -218,8 +218,6 @@ static inline int notifier_to_errno(int ret)
 #define SYS_HALT       0x0002  /* Notify of system halt */
 #define SYS_POWER_OFF  0x0003  /* Notify of system power off */
 
-#define NETLINK_URELEASE       0x0001  /* Unicast netlink socket released */
-
 #define CPU_ONLINE             0x0002 /* CPU (unsigned)v is up */
 #define CPU_UP_PREPARE         0x0003 /* CPU (unsigned)v coming up */
 #define CPU_UP_CANCELED                0x0004 /* CPU (unsigned)v NOT coming up */
@@ -252,13 +250,9 @@ static inline int notifier_to_errno(int ret)
 #define CPU_DYING_FROZEN       (CPU_DYING | CPU_TASKS_FROZEN)
 #define CPU_STARTING_FROZEN    (CPU_STARTING | CPU_TASKS_FROZEN)
 
-/* 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 */
+/* Hibernation and suspend events are defined in include/linux/suspend.h. */
+
+#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 (file)
--- 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);