[POWERPC] powermac: disallow pmu sleep notifiers from aborting sleep

[net-next-2.6.git] / include / linux / pmu.h

diff --git a/include/linux/pmu.h b/include/linux/pmu.h
index 783177387ac61323fdfff6db8c3b717665d62c7c..b0952e532ed52a0e05cfb768bc7a479ce6d2ba34 100644 (file)
--- 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) */