diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/au1000/common/power.c | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c index 812a5f8b7d26..a8cd2c1b9e1b 100644 --- a/arch/mips/au1000/common/power.c +++ b/arch/mips/au1000/common/power.c | |||
@@ -251,7 +251,6 @@ int au_sleep(void) | |||
251 | static int pm_do_sleep(ctl_table * ctl, int write, struct file *file, | 251 | static int pm_do_sleep(ctl_table * ctl, int write, struct file *file, |
252 | void __user *buffer, size_t * len, loff_t *ppos) | 252 | void __user *buffer, size_t * len, loff_t *ppos) |
253 | { | 253 | { |
254 | int retval = 0; | ||
255 | #ifdef SLEEP_TEST_TIMEOUT | 254 | #ifdef SLEEP_TEST_TIMEOUT |
256 | #define TMPBUFLEN2 16 | 255 | #define TMPBUFLEN2 16 |
257 | char buf[TMPBUFLEN2], *p; | 256 | char buf[TMPBUFLEN2], *p; |
@@ -271,36 +270,12 @@ static int pm_do_sleep(ctl_table * ctl, int write, struct file *file, | |||
271 | p = buf; | 270 | p = buf; |
272 | sleep_ticks = simple_strtoul(p, &p, 0); | 271 | sleep_ticks = simple_strtoul(p, &p, 0); |
273 | #endif | 272 | #endif |
274 | retval = pm_send_all(PM_SUSPEND, (void *) 2); | ||
275 | |||
276 | if (retval) | ||
277 | return retval; | ||
278 | 273 | ||
279 | au_sleep(); | 274 | au_sleep(); |
280 | retval = pm_send_all(PM_RESUME, (void *) 0); | ||
281 | } | 275 | } |
282 | return retval; | 276 | return 0; |
283 | } | ||
284 | |||
285 | static int pm_do_suspend(ctl_table * ctl, int write, struct file *file, | ||
286 | void __user *buffer, size_t * len, loff_t *ppos) | ||
287 | { | ||
288 | int retval = 0; | ||
289 | |||
290 | if (!write) { | ||
291 | *len = 0; | ||
292 | } else { | ||
293 | retval = pm_send_all(PM_SUSPEND, (void *) 2); | ||
294 | if (retval) | ||
295 | return retval; | ||
296 | suspend_mode = 1; | ||
297 | |||
298 | retval = pm_send_all(PM_RESUME, (void *) 0); | ||
299 | } | ||
300 | return retval; | ||
301 | } | 277 | } |
302 | 278 | ||
303 | |||
304 | static int pm_do_freq(ctl_table * ctl, int write, struct file *file, | 279 | static int pm_do_freq(ctl_table * ctl, int write, struct file *file, |
305 | void __user *buffer, size_t * len, loff_t *ppos) | 280 | void __user *buffer, size_t * len, loff_t *ppos) |
306 | { | 281 | { |
@@ -414,14 +389,6 @@ static int pm_do_freq(ctl_table * ctl, int write, struct file *file, | |||
414 | 389 | ||
415 | static struct ctl_table pm_table[] = { | 390 | static struct ctl_table pm_table[] = { |
416 | { | 391 | { |
417 | .ctl_name = CTL_UNNUMBERED, | ||
418 | .procname = "suspend", | ||
419 | .data = NULL, | ||
420 | .maxlen = 0, | ||
421 | .mode = 0600, | ||
422 | .proc_handler = &pm_do_suspend | ||
423 | }, | ||
424 | { | ||
425 | .ctl_name = CTL_UNNUMBERED, | 392 | .ctl_name = CTL_UNNUMBERED, |
426 | .procname = "sleep", | 393 | .procname = "sleep", |
427 | .data = NULL, | 394 | .data = NULL, |