The patch titled
power management: no valid states w/o pm_ops
has been removed from the -mm tree. Its filename was
power-management-no-valid-states-w-o-pm_ops-docs.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: power management: no valid states w/o pm_ops
From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Change /sys/power/state to not advertise any valid states (except for disk
if SOFTWARE_SUSPEND is enabled) when no pm_ops have been set so userspace
can easily discover what states should be available.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Cc: "Randy.Dunlap" <rdunlap@xxxxxxxxxxxx>
Cc: Rafael J. Wysocki <rjw@xxxxxxx>
Cc: Pavel Macheck <pavel@xxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/power/main.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletion(-)
diff -puN kernel/power/main.c~power-management-no-valid-states-w-o-pm_ops-docs kernel/power/main.c
--- a/kernel/power/main.c~power-management-no-valid-states-w-o-pm_ops-docs
+++ a/kernel/power/main.c
@@ -167,7 +167,10 @@ static inline int valid_state(suspend_st
if (state == PM_SUSPEND_DISK)
return 1;
- if (pm_ops && pm_ops->valid && !pm_ops->valid(state))
+ /* all other states need lowlevel support and need to be
+ * valid to the lowlevel implementation, no valid callback
+ * implies that all are valid. */
+ if (!pm_ops || (pm_ops->valid && !pm_ops->valid(state)))
return 0;
return 1;
}
_
Patches currently in -mm which might be from johannes@xxxxxxxxxxxxxxxx are
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
