power management: remove firmware disk mode
This patch removes the firmware disk suspend mode which is the wrong approach, it is supposed to be used for implementing firmware-based disk suspend but cannot actually be used for that. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Pavel Machek <pavel@ucw.cz> Cc: <linux-pm@lists.linux-foundation.org> Cc: David Brownell <david-b@pacbell.net> Cc: Len Brown <lenb@kernel.org> Acked-by: Russell King <rmk@arm.linux.org.uk> Cc: Greg KH <greg@kroah.com> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Cc: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
fe0c935a6c
commit
11d77d0c01
@ -114,13 +114,12 @@ typedef int __bitwise suspend_disk_method_t;
|
||||
|
||||
/* invalid must be 0 so struct pm_ops initialisers can leave it out */
|
||||
#define PM_DISK_INVALID ((__force suspend_disk_method_t) 0)
|
||||
#define PM_DISK_FIRMWARE ((__force suspend_disk_method_t) 1)
|
||||
#define PM_DISK_PLATFORM ((__force suspend_disk_method_t) 2)
|
||||
#define PM_DISK_SHUTDOWN ((__force suspend_disk_method_t) 3)
|
||||
#define PM_DISK_REBOOT ((__force suspend_disk_method_t) 4)
|
||||
#define PM_DISK_TEST ((__force suspend_disk_method_t) 5)
|
||||
#define PM_DISK_TESTPROC ((__force suspend_disk_method_t) 6)
|
||||
#define PM_DISK_MAX ((__force suspend_disk_method_t) 7)
|
||||
#define PM_DISK_PLATFORM ((__force suspend_disk_method_t) 1)
|
||||
#define PM_DISK_SHUTDOWN ((__force suspend_disk_method_t) 2)
|
||||
#define PM_DISK_REBOOT ((__force suspend_disk_method_t) 3)
|
||||
#define PM_DISK_TEST ((__force suspend_disk_method_t) 4)
|
||||
#define PM_DISK_TESTPROC ((__force suspend_disk_method_t) 5)
|
||||
#define PM_DISK_MAX ((__force suspend_disk_method_t) 6)
|
||||
|
||||
/**
|
||||
* struct pm_ops - Callbacks for managing platform dependent suspend states.
|
||||
|
Reference in New Issue
Block a user