aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/via-pmu-led.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-03-19 11:53:55 +0100
committerPaul Mackerras <paulus@samba.org>2007-03-26 12:35:17 +1000
commit70b52b3869a31aab85241a1f998f9943a3905637 (patch)
tree3c6944c5545c206cc43b8c20f1b9fe150b7ac0e9 /drivers/macintosh/via-pmu-led.c
parent17e638bc28f2fdc9c0d3eebfb80fce43827b8d12 (diff)
downloadkernel_samsung_espresso10-70b52b3869a31aab85241a1f998f9943a3905637.zip
kernel_samsung_espresso10-70b52b3869a31aab85241a1f998f9943a3905637.tar.gz
kernel_samsung_espresso10-70b52b3869a31aab85241a1f998f9943a3905637.tar.bz2
[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.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c
index 179af10..ed8423f 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 = {
};
#ifdef CONFIG_PM
-static int pmu_led_sleep_call(struct pmu_sleep_notifier *self, int when)
+static void pmu_led_sleep_call(struct pmu_sleep_notifier *self, int when)
{
unsigned long flags;
@@ -99,8 +99,6 @@ static int pmu_led_sleep_call(struct pmu_sleep_notifier *self, int when)
break;
}
spin_unlock_irqrestore(&pmu_blink_lock, flags);
-
- return PBOOK_SLEEP_OK;
}
static struct pmu_sleep_notifier via_pmu_led_sleep_notif = {