PM / Sleep: Merge internal functions in generic_ops.c

After the change that removed the code related to runtime PM
from __pm_generic_call() and __pm_generic_resume() these two
functions need not be separate any more, so merge them.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c
index 1b878b955c8ad79cfaaa624508ebbe1506ad3749..5a5b154bc1e9c83ab4b6b74f059106e5d404a306 100644 (file)
--- a/drivers/base/power/generic_ops.c
+++ b/drivers/base/power/generic_ops.c
@@ -97,7 +97,7 @@ int pm_generic_prepare(struct device *dev)
  * @event: PM transition of the system under way.
  * @bool: Whether or not this is the "noirq" stage.
  *
- * Execute the suspend/freeze/poweroff/thaw callback provided by the driver of
+ * 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.
  */
@@ -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;
@@ -210,45 +216,13 @@ 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, and return its error code.  Return 0 if the callback is not present.
- */
-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 *);
-
-       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;
-       }
-
-       return callback ? callback(dev) : 0;
-}
-
 /**
  * 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);
 
@@ -258,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);
 
@@ -268,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);
 
@@ -278,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);