From: Pavel Machek <pavel@ucw.cz>
This patch kills unused constants from old pm_send() interface, and marks
it as deprecated.
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/include/linux/pm.h | 33 ++++++++++-----------------------
1 files changed, 10 insertions(+), 23 deletions(-)
diff -puN include/linux/pm.h~mark-old-power-managment-as-deprecated-and-clean-it-up include/linux/pm.h
--- 25/include/linux/pm.h~mark-old-power-managment-as-deprecated-and-clean-it-up Thu Aug 19 15:23:00 2004
+++ 25-akpm/include/linux/pm.h Thu Aug 19 15:23:00 2004
@@ -28,33 +28,20 @@
#include <asm/atomic.h>
/*
- * Power management requests
+ * Power management requests... these are passed to pm_send_all() and friends.
+ *
+ * these functions are old and deprecated, see below.
*/
-enum
+typedef enum pm_request
{
PM_SUSPEND, /* enter D1-D3 */
PM_RESUME, /* enter D0 */
-
- PM_SAVE_STATE, /* save device's state */
-
- /* enable wake-on */
- PM_SET_WAKEUP,
-
- /* bus resource management */
- PM_GET_RESOURCES,
- PM_SET_RESOURCES,
-
- /* base station management */
- PM_EJECT,
- PM_LOCK,
-};
-
-typedef int pm_request_t;
+} pm_request_t;
/*
- * Device types
+ * Device types... these are passed to pm_register
*/
-enum
+typedef enum pm_dev_type
{
PM_UNKNOWN_DEV = 0, /* generic */
PM_SYS_DEV, /* system device (fan, KB controller, ...) */
@@ -63,9 +50,7 @@ enum
PM_SCSI_DEV, /* SCSI device */
PM_ISA_DEV, /* ISA device */
PM_MTD_DEV, /* Memory Technology Device */
-};
-
-typedef int pm_dev_t;
+} pm_dev_t;
/*
* System device hardware ID (PnP) values
@@ -186,6 +171,8 @@ static inline void pm_dev_idle(struct pm
#endif /* CONFIG_PM */
+/* Functions above this comment are list-based old-style power
+ * managment. Please avoid using them. */
/*
* Callbacks for platform drivers to implement.
_