git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
base
/
power
/
power.h
diff --git
a/drivers/base/power/power.h
b/drivers/base/power/power.h
index
6971cc6
..
fb3d35a
100644
(file)
--- a/
drivers/base/power/power.h
+++ b/
drivers/base/power/power.h
@@
-1,18
+1,7
@@
-
-
-enum {
- DEVICE_PM_ON,
- DEVICE_PM1,
- DEVICE_PM2,
- DEVICE_PM3,
- DEVICE_PM_OFF,
-};
-
/*
* shutdown.c
*/
/*
* shutdown.c
*/
-extern int device_detach_shutdown(struct device *);
extern void device_shutdown(void);
extern void device_shutdown(void);
@@
-27,6
+16,11
@@
extern void device_shutdown(void);
*/
extern struct semaphore dpm_sem;
*/
extern struct semaphore dpm_sem;
+/*
+ * Used to serialize changes to the dpm_* lists.
+ */
+extern struct semaphore dpm_list_sem;
+
/*
* The PM lists.
*/
/*
* The PM lists.
*/
@@
-66,16
+60,13
@@
extern int resume_device(struct device *);
/*
* suspend.c
*/
/*
* suspend.c
*/
-extern int suspend_device(struct device *,
u32
);
+extern int suspend_device(struct device *,
pm_message_t
);
/*
* runtime.c
*/
/*
* runtime.c
*/
-extern int dpm_runtime_suspend(struct device *, u32);
-extern void dpm_runtime_resume(struct device *);
-
#else /* CONFIG_PM */
#else /* CONFIG_PM */
@@
-88,14
+79,4
@@
static inline void device_pm_remove(struct device * dev)
}
}
-static inline int dpm_runtime_suspend(struct device * dev, u32 state)
-{
- return 0;
-}
-
-static inline void dpm_runtime_resume(struct device * dev)
-{
-
-}
-
#endif
#endif