Commit f596575e81999c0faf01a2fd340bc96dda058f80
Committed by
Paul Mackerras
1 parent
0108d3fe3c
Exists in
master
and in
7 other branches
[POWERPC] via-pmu: remove LED sleep notifier
The generic LED code now makes sure that suspended devices don't blink, so we no longer need to do it ourselves. For the suspend to disk case, however, we need to make sure that we don't blink if the PMU sysdev was suspended before the LED device. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Showing 3 changed files with 12 additions and 33 deletions Side-by-side Diff
drivers/macintosh/via-pmu-led.c
... | ... | @@ -31,7 +31,6 @@ |
31 | 31 | static struct adb_request pmu_blink_req; |
32 | 32 | /* -1: no change, 0: request off, 1: request on */ |
33 | 33 | static int requested_change; |
34 | -static int sleeping; | |
35 | 34 | |
36 | 35 | static void pmu_req_done(struct adb_request * req) |
37 | 36 | { |
... | ... | @@ -41,7 +40,7 @@ |
41 | 40 | /* if someone requested a change in the meantime |
42 | 41 | * (we only see the last one which is fine) |
43 | 42 | * then apply it now */ |
44 | - if (requested_change != -1 && !sleeping) | |
43 | + if (requested_change != -1 && !pmu_sys_suspended) | |
45 | 44 | pmu_request(&pmu_blink_req, NULL, 4, 0xee, 4, 0, requested_change); |
46 | 45 | /* reset requested change */ |
47 | 46 | requested_change = -1; |
... | ... | @@ -66,7 +65,7 @@ |
66 | 65 | break; |
67 | 66 | } |
68 | 67 | /* if request isn't done, then don't do anything */ |
69 | - if (pmu_blink_req.complete && !sleeping) | |
68 | + if (pmu_blink_req.complete && !pmu_sys_suspended) | |
70 | 69 | pmu_request(&pmu_blink_req, NULL, 4, 0xee, 4, 0, requested_change); |
71 | 70 | out: |
72 | 71 | spin_unlock_irqrestore(&pmu_blink_lock, flags); |
... | ... | @@ -80,32 +79,6 @@ |
80 | 79 | .brightness_set = pmu_led_set, |
81 | 80 | }; |
82 | 81 | |
83 | -#ifdef CONFIG_PM | |
84 | -static void pmu_led_sleep_call(struct pmu_sleep_notifier *self, int when) | |
85 | -{ | |
86 | - unsigned long flags; | |
87 | - | |
88 | - spin_lock_irqsave(&pmu_blink_lock, flags); | |
89 | - | |
90 | - switch (when) { | |
91 | - case PBOOK_SLEEP_REQUEST: | |
92 | - sleeping = 1; | |
93 | - break; | |
94 | - case PBOOK_WAKE: | |
95 | - sleeping = 0; | |
96 | - break; | |
97 | - default: | |
98 | - /* do nothing */ | |
99 | - break; | |
100 | - } | |
101 | - spin_unlock_irqrestore(&pmu_blink_lock, flags); | |
102 | -} | |
103 | - | |
104 | -static struct pmu_sleep_notifier via_pmu_led_sleep_notif = { | |
105 | - .notifier_call = pmu_led_sleep_call, | |
106 | -}; | |
107 | -#endif | |
108 | - | |
109 | 82 | static int __init via_pmu_led_init(void) |
110 | 83 | { |
111 | 84 | struct device_node *dt; |
... | ... | @@ -135,9 +108,7 @@ |
135 | 108 | /* no outstanding req */ |
136 | 109 | pmu_blink_req.complete = 1; |
137 | 110 | pmu_blink_req.done = pmu_req_done; |
138 | -#ifdef CONFIG_PM | |
139 | - pmu_register_sleep_notifier(&via_pmu_led_sleep_notif); | |
140 | -#endif | |
111 | + | |
141 | 112 | return led_classdev_register(NULL, &pmu_led); |
142 | 113 | } |
143 | 114 |
drivers/macintosh/via-pmu.c
include/linux/pmu.h
... | ... | @@ -225,5 +225,13 @@ |
225 | 225 | /* Backlight */ |
226 | 226 | extern void pmu_backlight_init(void); |
227 | 227 | |
228 | +/* some code needs to know if the PMU was suspended for hibernation */ | |
229 | +#ifdef CONFIG_PM | |
230 | +extern int pmu_sys_suspended; | |
231 | +#else | |
232 | +/* if power management is not configured it can't be suspended */ | |
233 | +#define pmu_sys_suspended 0 | |
234 | +#endif | |
235 | + | |
228 | 236 | #endif /* __KERNEL__ */ |