diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-03-19 06:53:55 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-03-25 22:35:17 -0400 |
commit | 70b52b3869a31aab85241a1f998f9943a3905637 (patch) | |
tree | 3c6944c5545c206cc43b8c20f1b9fe150b7ac0e9 /drivers/macintosh/via-pmu-led.c | |
parent | 17e638bc28f2fdc9c0d3eebfb80fce43827b8d12 (diff) |
[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 'drivers/macintosh/via-pmu-led.c')
-rw-r--r-- | drivers/macintosh/via-pmu-led.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c index 179af10105d9..ed8423f4605d 100644 --- a/drivers/macintosh/via-pmu-led.c +++ b/drivers/macintosh/via-pmu-led.c | |||
@@ -81,7 +81,7 @@ static struct led_classdev pmu_led = { | |||
81 | }; | 81 | }; |
82 | 82 | ||
83 | #ifdef CONFIG_PM | 83 | #ifdef CONFIG_PM |
84 | static int pmu_led_sleep_call(struct pmu_sleep_notifier *self, int when) | 84 | static void pmu_led_sleep_call(struct pmu_sleep_notifier *self, int when) |
85 | { | 85 | { |
86 | unsigned long flags; | 86 | unsigned long flags; |
87 | 87 | ||
@@ -99,8 +99,6 @@ static int pmu_led_sleep_call(struct pmu_sleep_notifier *self, int when) | |||
99 | break; | 99 | break; |
100 | } | 100 | } |
101 | spin_unlock_irqrestore(&pmu_blink_lock, flags); | 101 | spin_unlock_irqrestore(&pmu_blink_lock, flags); |
102 | |||
103 | return PBOOK_SLEEP_OK; | ||
104 | } | 102 | } |
105 | 103 | ||
106 | static struct pmu_sleep_notifier via_pmu_led_sleep_notif = { | 104 | static struct pmu_sleep_notifier via_pmu_led_sleep_notif = { |