Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35eb6db1 authored by Amerigo Wang's avatar Amerigo Wang Committed by Linus Torvalds
Browse files

notifiers: pm: move pm notifiers into suspend.h 



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

Signed-off-by: default avatarWANG Cong <amwang@redhat.com>
Cc: David Miller <davem@davemloft.net>
Acked-by: default avatar"Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c5f41752

drivers/mmc/core/core.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/log2.h>

#include <linux/log2.h>

#include <linux/regulator/consumer.h>

#include <linux/regulator/consumer.h>

#include <linux/pm_runtime.h>

#include <linux/pm_runtime.h>

#include <linux/suspend.h>





#include <linux/mmc/card.h>

#include <linux/mmc/card.h>

#include <linux/mmc/host.h>

#include <linux/mmc/host.h>

include/linux/notifier.h

+2 −8
Original line number Original line Diff line number Diff line
@@ -191,15 +191,9 @@ static inline int notifier_to_errno(int ret) 




/* reboot notifiers are defined in include/linux/reboot.h. */

/* 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 NETLINK_URELEASE	0x0001	/* Unicast netlink socket released */

#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 */





/* Console keyboard events.

/* Console keyboard events.

 * Note: KBD_KEYCODE is always sent before KBD_UNBOUND_KEYCODE, KBD_UNICODE and

 * Note: KBD_KEYCODE is always sent before KBD_UNBOUND_KEYCODE, KBD_UNICODE and

include/linux/suspend.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -268,6 +268,14 @@ static inline int hibernate(void) { return -ENOSYS; } 
static inline bool system_entering_hibernation(void) { return false; }

static inline bool system_entering_hibernation(void) { return false; }

#endif /* CONFIG_HIBERNATION */

#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

#ifdef CONFIG_PM_SLEEP

void save_processor_state(void);

void save_processor_state(void);

void restore_processor_state(void);

void restore_processor_state(void);