diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2007-03-19 11:53:55 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-03-26 12:35:17 +1000 |
| commit | 70b52b3869a31aab85241a1f998f9943a3905637 (patch) | |
| tree | 3c6944c5545c206cc43b8c20f1b9fe150b7ac0e9 /include/linux/pmu.h | |
| parent | 17e638bc28f2fdc9c0d3eebfb80fce43827b8d12 (diff) | |
| download | op-kernel-dev-70b52b3869a31aab85241a1f998f9943a3905637.zip op-kernel-dev-70b52b3869a31aab85241a1f998f9943a3905637.tar.gz | |
[POWERPC] powermac: disallow pmu sleep notifiers from aborting sleep
Tracing through the code, no current PMU sleep notifier can abort sleep.
Since no new PMU sleep notifiers should be added, this patch simplifies the
code and removes the ability to abort sleep.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/linux/pmu.h')
| -rw-r--r-- | include/linux/pmu.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/include/linux/pmu.h b/include/linux/pmu.h index 7831773..b0952e5 100644 --- a/include/linux/pmu.h +++ b/include/linux/pmu.h @@ -168,24 +168,16 @@ extern int pmu_get_model(void); struct pmu_sleep_notifier { - int (*notifier_call)(struct pmu_sleep_notifier *self, int when); + void (*notifier_call)(struct pmu_sleep_notifier *self, int when); int priority; struct list_head list; }; /* Code values for calling sleep/wakeup handlers - * - * Note: If a sleep request got cancelled, all drivers will get - * the PBOOK_SLEEP_REJECT, even those who didn't get the PBOOK_SLEEP_REQUEST. */ #define PBOOK_SLEEP_REQUEST 1 #define PBOOK_SLEEP_NOW 2 -#define PBOOK_SLEEP_REJECT 3 -#define PBOOK_WAKE 4 - -/* Result codes returned by the notifiers */ -#define PBOOK_SLEEP_OK 0 -#define PBOOK_SLEEP_REFUSE -1 +#define PBOOK_WAKE 3 /* priority levels in notifiers */ #define SLEEP_LEVEL_VIDEO 100 /* Video driver (first wake) */ |
