|
@@ -57,16 +57,6 @@ int pm_notifier_call_chain(unsigned long val)
|
|
|
#ifdef CONFIG_PM_DEBUG
|
|
|
int pm_test_level = TEST_NONE;
|
|
|
|
|
|
-static int suspend_test(int level)
|
|
|
-{
|
|
|
- if (pm_test_level == level) {
|
|
|
- printk(KERN_INFO "suspend debug: Waiting for 5 seconds.\n");
|
|
|
- mdelay(5000);
|
|
|
- return 1;
|
|
|
- }
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
static const char * const pm_tests[__TEST_AFTER_LAST] = {
|
|
|
[TEST_NONE] = "none",
|
|
|
[TEST_CORE] = "core",
|
|
@@ -125,14 +115,24 @@ static ssize_t pm_test_store(struct kobject *kobj, struct kobj_attribute *attr,
|
|
|
}
|
|
|
|
|
|
power_attr(pm_test);
|
|
|
-#else /* !CONFIG_PM_DEBUG */
|
|
|
-static inline int suspend_test(int level) { return 0; }
|
|
|
-#endif /* !CONFIG_PM_DEBUG */
|
|
|
+#endif /* CONFIG_PM_DEBUG */
|
|
|
|
|
|
#endif /* CONFIG_PM_SLEEP */
|
|
|
|
|
|
#ifdef CONFIG_SUSPEND
|
|
|
|
|
|
+static int suspend_test(int level)
|
|
|
+{
|
|
|
+#ifdef CONFIG_PM_DEBUG
|
|
|
+ if (pm_test_level == level) {
|
|
|
+ printk(KERN_INFO "suspend debug: Waiting for 5 seconds.\n");
|
|
|
+ mdelay(5000);
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+#endif /* !CONFIG_PM_DEBUG */
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
#ifdef CONFIG_PM_TEST_SUSPEND
|
|
|
|
|
|
/*
|