@@ -584,9 +584,9 @@ static int _od_suspend_noirq(struct device *dev)
int ret;
if (od->flags & OMAP_DEVICE_NO_IDLE_ON_SUSPEND)
- return pm_generic_suspend_noirq(dev);
+ return pm_generic_suspend(dev);
- ret = pm_generic_suspend_noirq(dev);
+ ret = pm_generic_suspend(dev);
if (!ret && !pm_runtime_status_suspended(dev)) {
if (pm_generic_runtime_suspend(dev) == 0) {
@@ -604,7 +604,7 @@ static int _od_resume_noirq(struct device *dev)
struct omap_device *od = to_omap_device(pdev);
if (od->flags & OMAP_DEVICE_NO_IDLE_ON_SUSPEND)
- return pm_generic_resume_noirq(dev);
+ return pm_generic_resume(dev);
if ((od->flags & OMAP_DEVICE_SUSPENDED) &&
!pm_runtime_status_suspended(dev)) {
@@ -613,7 +613,7 @@ static int _od_resume_noirq(struct device *dev)
pm_generic_runtime_resume(dev);
}
- return pm_generic_resume_noirq(dev);
+ return pm_generic_resume(dev);
}
#endif