diff options
author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2010-06-01 11:17:09 +0530 |
---|---|---|
committer | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2010-06-01 11:17:09 +0530 |
commit | a0dc34729efd6ed7a313594dbc7b10a81f62b2e6 (patch) | |
tree | c1e4a444c8d18f43d4947635e1099e1a88c946de /arch/arm | |
parent | 082c58f7f82ef5e64522875c0f5e08f27429e5af (diff) |
Revert "OMAP: PM: use omap_device API for suspend/resume"
This reverts commit 907ff9a993eb51c8e9613015fa9fd8f8a841b7ae.
Regression with suspend
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/pm_bus.c | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/arch/arm/mach-omap2/pm_bus.c b/arch/arm/mach-omap2/pm_bus.c index 3787da83bf4b..69acaa577d22 100644 --- a/arch/arm/mach-omap2/pm_bus.c +++ b/arch/arm/mach-omap2/pm_bus.c @@ -70,64 +70,3 @@ int platform_pm_runtime_idle(struct device *dev) }; #endif /* CONFIG_PM_RUNTIME */ -#ifdef CONFIG_SUSPEND -int platform_pm_suspend_noirq(struct device *dev) -{ - struct device_driver *drv = dev->driver; - struct platform_device *pdev = to_platform_device(dev); - struct omap_device *odev = to_omap_device(pdev); - int ret = 0; - - if (!drv) - return 0; - - if (drv->pm) { - if (drv->pm->suspend_noirq) - ret = drv->pm->suspend_noirq(dev); - } - - if (omap_device_is_valid(odev)) { - if (odev->flags & OMAP_DEVICE_NO_BUS_SUSPEND) { - dev_dbg(dev, "no automatic bus-level system resume.\n"); - return 0; - } - - dev_dbg(dev, "%s\n", __func__); - omap_device_idle(pdev); - } else { - dev_dbg(dev, "not an omap_device\n"); - } - - return ret; -} - -int platform_pm_resume_noirq(struct device *dev) -{ - struct device_driver *drv = dev->driver; - struct platform_device *pdev = to_platform_device(dev); - struct omap_device *odev = to_omap_device(pdev); - int ret = 0; - - if (omap_device_is_valid(odev)) { - if (odev->flags & OMAP_DEVICE_NO_BUS_SUSPEND) { - dev_dbg(dev, "no automatic bus-level system resume.\n"); - return 0; - } - - dev_dbg(dev, "%s\n", __func__); - omap_device_enable(pdev); - } else { - dev_dbg(dev, "not an omap_device\n"); - } - - if (!drv) - return 0; - - if (drv->pm) { - if (drv->pm->resume_noirq) - ret = drv->pm->resume_noirq(dev); - } - - return ret; -} -#endif /* CONFIG_SUSPEND */ |