1 files changed, 14 insertions, 77 deletions

diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c
index 265a0ee3b49e..10bdd793f0bd 100644
--- a/drivers/base/power/generic_ops.c
+++ b/drivers/base/power/generic_ops.c
@@ -97,16 +97,16 @@ int pm_generic_prepare(struct device *dev)
  * @event: PM transition of the system under way.
  * @bool: Whether or not this is the "noirq" stage.
  *
- * If the device has not been suspended at run time, execute the
- * suspend/freeze/poweroff/thaw callback provided by its driver, if defined, and
- * return its error code.  Otherwise, return zero.
+ * Execute the PM callback corresponding to @event provided by the driver of
+ * @dev, if defined, and return its error code.    Return 0 if the callback is
+ * not present.
  */
 static int __pm_generic_call(struct device *dev, int event, bool noirq)
 {
         const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int (*callback)(struct device *);
 
-        if (!pm || pm_runtime_suspended(dev))
+        if (!pm)
                 return 0;
 
         switch (event) {
@@ -119,9 +119,15 @@ static int __pm_generic_call(struct device *dev, int event, bool noirq)
         case PM_EVENT_HIBERNATE:
                 callback = noirq ? pm->poweroff_noirq : pm->poweroff;
                 break;
+        case PM_EVENT_RESUME:
+                callback = noirq ? pm->resume_noirq : pm->resume;
+                break;
         case PM_EVENT_THAW:
                 callback = noirq ? pm->thaw_noirq : pm->thaw;
                 break;
+        case PM_EVENT_RESTORE:
+                callback = noirq ? pm->restore_noirq : pm->restore;
+                break;
         default:
                 callback = NULL;
                 break;
@@ -211,56 +217,12 @@ int pm_generic_thaw(struct device *dev)
 EXPORT_SYMBOL_GPL(pm_generic_thaw);
 
 /**
- * __pm_generic_resume - Generic resume/restore callback for subsystems.
- * @dev: Device to handle.
- * @event: PM transition of the system under way.
- * @bool: Whether or not this is the "noirq" stage.
- *
- * Execute the resume/resotre callback provided by the @dev's driver, if
- * defined.  If it returns 0, change the device's runtime PM status to 'active'.
- * Return the callback's error code.
- */
-static int __pm_generic_resume(struct device *dev, int event, bool noirq)
-{
-        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-        int (*callback)(struct device *);
-        int ret;
-
-        if (!pm)
-                return 0;
-
-        switch (event) {
-        case PM_EVENT_RESUME:
-                callback = noirq ? pm->resume_noirq : pm->resume;
-                break;
-        case PM_EVENT_RESTORE:
-                callback = noirq ? pm->restore_noirq : pm->restore;
-                break;
-        default:
-                callback = NULL;
-                break;
-        }
-
-        if (!callback)
-                return 0;
-
-        ret = callback(dev);
-        if (!ret && !noirq && pm_runtime_enabled(dev)) {
-                pm_runtime_disable(dev);
-                pm_runtime_set_active(dev);
-                pm_runtime_enable(dev);
-        }
-
-        return ret;
-}
-
-/**
  * pm_generic_resume_noirq - Generic resume_noirq callback for subsystems.
  * @dev: Device to resume.
  */
 int pm_generic_resume_noirq(struct device *dev)
 {
-        return __pm_generic_resume(dev, PM_EVENT_RESUME, true);
+        return __pm_generic_call(dev, PM_EVENT_RESUME, true);
 }
 EXPORT_SYMBOL_GPL(pm_generic_resume_noirq);
 
@@ -270,7 +232,7 @@ EXPORT_SYMBOL_GPL(pm_generic_resume_noirq);
  */
 int pm_generic_resume(struct device *dev)
 {
-        return __pm_generic_resume(dev, PM_EVENT_RESUME, false);
+        return __pm_generic_call(dev, PM_EVENT_RESUME, false);
 }
 EXPORT_SYMBOL_GPL(pm_generic_resume);
 
@@ -280,7 +242,7 @@ EXPORT_SYMBOL_GPL(pm_generic_resume);
  */
 int pm_generic_restore_noirq(struct device *dev)
 {
-        return __pm_generic_resume(dev, PM_EVENT_RESTORE, true);
+        return __pm_generic_call(dev, PM_EVENT_RESTORE, true);
 }
 EXPORT_SYMBOL_GPL(pm_generic_restore_noirq);
 
@@ -290,7 +252,7 @@ EXPORT_SYMBOL_GPL(pm_generic_restore_noirq);
  */
 int pm_generic_restore(struct device *dev)
 {
-        return __pm_generic_resume(dev, PM_EVENT_RESTORE, false);
+        return __pm_generic_call(dev, PM_EVENT_RESTORE, false);
 }
 EXPORT_SYMBOL_GPL(pm_generic_restore);
 
@@ -314,28 +276,3 @@ void pm_generic_complete(struct device *dev)
         pm_runtime_idle(dev);
 }
 #endif /* CONFIG_PM_SLEEP */
-
-struct dev_pm_ops generic_subsys_pm_ops = {
-#ifdef CONFIG_PM_SLEEP
-        .prepare = pm_generic_prepare,
-        .suspend = pm_generic_suspend,
-        .suspend_noirq = pm_generic_suspend_noirq,
-        .resume = pm_generic_resume,
-        .resume_noirq = pm_generic_resume_noirq,
-        .freeze = pm_generic_freeze,
-        .freeze_noirq = pm_generic_freeze_noirq,
-        .thaw = pm_generic_thaw,
-        .thaw_noirq = pm_generic_thaw_noirq,
-        .poweroff = pm_generic_poweroff,
-        .poweroff_noirq = pm_generic_poweroff_noirq,
-        .restore = pm_generic_restore,
-        .restore_noirq = pm_generic_restore_noirq,
-        .complete = pm_generic_complete,
-#endif
-#ifdef CONFIG_PM_RUNTIME
-        .runtime_suspend = pm_generic_runtime_suspend,
-        .runtime_resume = pm_generic_runtime_resume,
-        .runtime_idle = pm_generic_runtime_idle,
-#endif
-};
-EXPORT_SYMBOL_GPL(generic_subsys_pm_ops);