@@ -817,11 +817,9 @@ static int _od_suspend_noirq(struct device *dev)
ret = pm_generic_suspend_noirq(dev);
if (!ret && !pm_runtime_status_suspended(dev)) {
- if (pm_generic_runtime_suspend(dev) == 0) {
- if (!(od->flags & OMAP_DEVICE_NO_IDLE_ON_SUSPEND))
- omap_device_idle(pdev);
- od->flags |= OMAP_DEVICE_SUSPENDED;
- }
+ if (!(od->flags & OMAP_DEVICE_NO_IDLE_ON_SUSPEND))
+ omap_device_idle(pdev);
+ od->flags |= OMAP_DEVICE_SUSPENDED;
}
return ret;
@@ -841,7 +839,6 @@ static int _od_resume_noirq(struct device *dev)
od->flags &= ~OMAP_DEVICE_SUSPENDED;
if (!(od->flags & OMAP_DEVICE_NO_IDLE_ON_SUSPEND))
omap_device_enable(pdev);
- pm_generic_runtime_resume(dev);
}
return pm_generic_resume_noirq(dev);
device drivers should be smart enough to provide ->suspend/->resume callbacks when needed and they should take care of doing whatever needs to be done in order to allow a device to be suspended. Calling pm_runtime_* from system suspend isn't the right way to achieve that, as it creates a situation where OMAP's PM has different requirements and semantics than all other architectures. Signed-off-by: Felipe Balbi <balbi@ti.com> --- arch/arm/plat-omap/omap_device.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)