summaryrefslogtreecommitdiff
path: root/arch/mips/au1000
diff options
context:
space:
mode:
authorPavel Machek <pavel@suse.cz>2008-03-13 22:52:49 (GMT)
committerLen Brown <len.brown@intel.com>2008-04-15 07:19:07 (GMT)
commit6afe1a1fe8ff83f6ac2726b04665e76ba7b14f3e (patch)
treeafb11aefbd33e4fa73b777abdd6ccbb42da36797 /arch/mips/au1000
parenta985aabe4d7a720b109c2b63549f8641676a9c88 (diff)
downloadlinux-6afe1a1fe8ff83f6ac2726b04665e76ba7b14f3e.tar.xz
PM: Remove legacy PM
AFAICT pm_send_all is a nop when noone uses pm_register... Hmm.. can we just force CONFIG_PM_LEGACY=n, and see what happens? Or maybe this is better idea? It may break build somewhere, but it should be easy to fix... (it builds here, i386 and x86-64). Signed-off-by: Pavel Machek <pavel@suse.cz> Acked-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/mips/au1000')
-rw-r--r--arch/mips/au1000/common/power.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c
index 54047d6..a9f7f63 100644
--- a/arch/mips/au1000/common/power.c
+++ b/arch/mips/au1000/common/power.c
@@ -258,7 +258,6 @@ int au_sleep(void)
static int pm_do_sleep(ctl_table * ctl, int write, struct file *file,
void __user *buffer, size_t * len, loff_t *ppos)
{
- int retval = 0;
#ifdef SLEEP_TEST_TIMEOUT
#define TMPBUFLEN2 16
char buf[TMPBUFLEN2], *p;
@@ -278,33 +277,21 @@ static int pm_do_sleep(ctl_table * ctl, int write, struct file *file,
p = buf;
sleep_ticks = simple_strtoul(p, &p, 0);
#endif
- retval = pm_send_all(PM_SUSPEND, (void *) 2);
-
- if (retval)
- return retval;
au_sleep();
- retval = pm_send_all(PM_RESUME, (void *) 0);
}
- return retval;
+ return 0;
}
static int pm_do_suspend(ctl_table * ctl, int write, struct file *file,
void __user *buffer, size_t * len, loff_t *ppos)
{
- int retval = 0;
-
if (!write) {
*len = 0;
} else {
- retval = pm_send_all(PM_SUSPEND, (void *) 2);
- if (retval)
- return retval;
suspend_mode = 1;
-
- retval = pm_send_all(PM_RESUME, (void *) 0);
}
- return retval;
+ return 0;
}