introduce .valid callback in pm_ops
Subsystems (4)
PATCH 1/1 introduce .valid callback in pm_ops
Hi,
This patch adds .valid callback in pm_ops, so only available pm states show in /sys/power/state. And this also makes an earlier states error report at enter_state before we do actual suspend/resume.
Signed-off-by Shaohua Li<[email protected]>
Acked-by Pavel Machek<[email protected]>
---
linux-2.6.14-rc1-root/drivers/acpi/sleep/main.c | 8 ++++++++ linux-2.6.14-rc1-root/include/linux/pm.h | 1 + linux-2.6.14-rc1-root/kernel/power/main.c | 5 ++++- 3 files changed, 13 insertions(+), 1 deletion(-)
kernel/power/main.c renamed from kernel/power/main.c~pm_states_cleanup +4 -1
@@ -167,6 +167,8 @@ static int enter_state(suspend_state_t s {int error; +if (pm_ops->valid && !pm_ops->valid (state)) +return -ENODEV ;if (down_trylock (&pm_sem))return -EBUSY ;
@@ -236,7 +238,8 @@ static ssize_t state_show(struct subsystchar * s = buf;for (i =0 ; i <PM_SUSPEND_MAX ; i++) { -if (pm_states[i]) +if (pm_states[i] && pm_ops && (!pm_ops->valid + ||(pm_ops->valid && pm_ops->valid (i)))) s +=sprintf (s,"%s " ,pm_states[i]); } s +=sprintf (s,"\n" );
include/linux/pm.h renamed from include/linux/pm.h~pm_states_cleanup +1 -0
@@ -170,6 +170,7 @@ typedef int __bitwise suspend_disk_methostruct pm_ops {suspend_disk_method_t pm_disk_mode; +int (*valid)(suspend_state_t state);int (*prepare)(suspend_state_t state);int (*enter)(suspend_state_t state);int (*finish)(suspend_state_t state);
drivers/acpi/sleep/main.c renamed from drivers/acpi/sleep/main.c~pm_states_cleanup +8 -0
@@ -158,7 +158,15 @@ int acpi_suspend(u32 acpi_state)return -EINVAL ; } +static int acpi_pm_state_valid (suspend_state_t pm_state) +{ +u32 acpi_state = acpi_suspend_states[pm_state]; + +return sleep_states[acpi_state]; +} +static struct pm_ops acpi_pm_ops = { + .valid = acpi_pm_state_valid, .prepare = acpi_pm_prepare, .enter = acpi_pm_enter, .finish = acpi_pm_finish,
_