diff options
| author | Balaji Rao <balajirrao@openmoko.org> | 2009-01-05 10:33:28 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2009-01-05 10:33:28 +0000 |
| commit | 276709515c384f4239c9479b56fcf008ae37eec8 (patch) | |
| tree | 331995beed2e1e174552073f2b4bd38a3a963828 /arch | |
| parent | bcd4eff43a16ed339d4b17141d8828e9228b2d52 (diff) | |
pcf50633 remove suspend_enable/disable regulator functions
Since we don't switch to PMU.standby, on suspend we should not
be defining these.
Btw, this fixes the WSOD I observed on andy-tracking and also
gets rid of the regulator related backtrace seen upon resume.
Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-s3c/pm.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/plat-s3c/pm.c b/arch/arm/plat-s3c/pm.c index 422dea207b0..889f191f835 100644 --- a/arch/arm/plat-s3c/pm.c +++ b/arch/arm/plat-s3c/pm.c @@ -18,7 +18,6 @@ #include <linux/delay.h> #include <linux/serial_core.h> #include <linux/io.h> -#include <linux/regulator/machine.h> #include <asm/cacheflush.h> #include <mach/hardware.h> @@ -353,22 +352,11 @@ static void s3c_pm_finish(void) s3c_pm_check_cleanup(); } -static int s3c_pm_begin(suspend_state_t state) -{ - int ret = 0; - -#ifdef CONFIG_REGULATOR - ret = regulator_suspend_prepare(state); -#endif - return ret; -} - static struct platform_suspend_ops s3c_pm_ops = { .enter = s3c_pm_enter, .prepare = s3c_pm_prepare, .finish = s3c_pm_finish, .valid = suspend_valid_only_mem, - .begin = s3c_pm_begin, }; /* s3c_pm_init |