Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e516a1db authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM / sleep: Put pm_test under CONFIG_PM_SLEEP_DEBUG 



The pm_test sysfs attribute is under CONFIG_PM_DEBUG, but it doesn't
make sense to provide it if CONFIG_PM_SLEEP is unset, so put it under
CONFIG_PM_SLEEP_DEBUG instead.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 9a3ebe35

kernel/power/main.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -150,7 +150,7 @@ static ssize_t mem_sleep_store(struct kobject *kobj, struct kobj_attribute *attr 
power_attr(mem_sleep);

power_attr(mem_sleep);

#endif /* CONFIG_SUSPEND */

#endif /* CONFIG_SUSPEND */





#ifdef CONFIG_PM_DEBUG

#ifdef CONFIG_PM_SLEEP_DEBUG

int pm_test_level = TEST_NONE;

int pm_test_level = TEST_NONE;





static const char * const pm_tests[__TEST_AFTER_LAST] = {

static const char * const pm_tests[__TEST_AFTER_LAST] = {
@@ -211,7 +211,7 @@ static ssize_t pm_test_store(struct kobject *kobj, struct kobj_attribute *attr, 
}

}





power_attr(pm_test);

power_attr(pm_test);

#endif /* CONFIG_PM_DEBUG */

#endif /* CONFIG_PM_SLEEP_DEBUG */





#ifdef CONFIG_DEBUG_FS

#ifdef CONFIG_DEBUG_FS

static char *suspend_step_name(enum suspend_stat_step step)

static char *suspend_step_name(enum suspend_stat_step step)
@@ -746,10 +746,8 @@ static struct attribute * g[] = { 
	&wake_lock_attr.attr,

	&wake_lock_attr.attr,

	&wake_unlock_attr.attr,

	&wake_unlock_attr.attr,

#endif

#endif

#ifdef CONFIG_PM_DEBUG

	&pm_test_attr.attr,

#endif

#ifdef CONFIG_PM_SLEEP_DEBUG

#ifdef CONFIG_PM_SLEEP_DEBUG

	&pm_test_attr.attr,

	&pm_print_times_attr.attr,

	&pm_print_times_attr.attr,

	&pm_wakeup_irq_attr.attr,

	&pm_wakeup_irq_attr.attr,

	&pm_debug_messages_attr.attr,

	&pm_debug_messages_attr.attr,

kernel/power/power.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -245,7 +245,7 @@ enum { 
#define TEST_FIRST	TEST_NONE

#define TEST_FIRST	TEST_NONE

#define TEST_MAX	(__TEST_AFTER_LAST - 1)

#define TEST_MAX	(__TEST_AFTER_LAST - 1)





#ifdef CONFIG_PM_DEBUG

#ifdef CONFIG_PM_SLEEP_DEBUG

extern int pm_test_level;

extern int pm_test_level;

#else

#else

#define pm_test_level	(TEST_NONE)

#define pm_test_level	(TEST_NONE)