projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[powerpc.git]
/
include
/
linux
/
pm.h
diff --git
a/include/linux/pm.h
b/include/linux/pm.h
index
6df2585
..
658c1b9
100644
(file)
--- a/
include/linux/pm.h
+++ b/
include/linux/pm.h
@@
-23,7
+23,6
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <linux/config.h>
#include <linux/list.h>
#include <asm/atomic.h>
#include <linux/list.h>
#include <asm/atomic.h>
@@
-199,6
+198,12
@@
extern int device_suspend(pm_message_t state);
extern int dpm_runtime_suspend(struct device *, pm_message_t);
extern void dpm_runtime_resume(struct device *);
extern int dpm_runtime_suspend(struct device *, pm_message_t);
extern void dpm_runtime_resume(struct device *);
+extern void __suspend_report_result(const char *function, void *fn, int ret);
+
+#define suspend_report_result(fn, ret) \
+ do { \
+ __suspend_report_result(__FUNCTION__, fn, ret); \
+ } while (0)
#else /* !CONFIG_PM */
#else /* !CONFIG_PM */
@@
-219,6
+224,8
@@
static inline void dpm_runtime_resume(struct device * dev)
{
}
{
}
+#define suspend_report_result(fn, ret) do { } while (0)
+
#endif
/* changes to device_may_wakeup take effect on the next pm state change.
#endif
/* changes to device_may_wakeup take effect on the next pm state change.