FROMLIST: PM / sleep: print function name of callbacks

[firefly-linux-kernel-4.4.55.git] / drivers / base / power / main.c

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 7eea95d490e614d5cefaba9e870ebb8115a32f92..d388edadfb6ad6fcdce33ea5d615c40528c33846 100644 (file)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -191,14 +191,14 @@ void device_pm_move_last(struct device *dev)
        list_move_tail(&dev->power.entry, &dpm_list);
 }
 
-static ktime_t initcall_debug_start(struct device *dev)
+static ktime_t initcall_debug_start(struct device *dev, void *cb)
 {
        ktime_t calltime = ktime_set(0, 0);
 
        if (pm_print_times_enabled) {
-               pr_info("calling  %s+ @ %i, parent: %s\n",
+               pr_info("calling  %s+ @ %i, parent: %s, cb: %pf\n",
                        dev_name(dev), task_pid_nr(current),
-                       dev->parent ? dev_name(dev->parent) : "none");
+                       dev->parent ? dev_name(dev->parent) : "none", cb);
                calltime = ktime_get();
        }
 
@@ -385,7 +385,7 @@ static int dpm_run_callback(pm_callback_t cb, struct device *dev,
        if (!cb)
                return 0;
 
-       calltime = initcall_debug_start(dev);
+       calltime = initcall_debug_start(dev, cb);
 
        pm_dev_dbg(dev, state, info);
        trace_device_pm_callback_start(dev, info, state.event);
@@ -1328,7 +1328,7 @@ static int legacy_suspend(struct device *dev, pm_message_t state,
        int error;
        ktime_t calltime;
 
-       calltime = initcall_debug_start(dev);
+       calltime = initcall_debug_start(dev, cb);
 
        trace_device_pm_callback_start(dev, info, state.event);
        error = cb(dev, state);