PM / core: Simplify initcall_debug_report() timing

initcall_debug_report() always called ktime_get(), even if we didn't
need the result.

Change it so we only call it when we're going to use the result, and
change initcall_debug_start() to follow the same style.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 85ef2af6dc9261c63c0d733c950c5b2a232861b5..b32750d18b093e55e168d0e4550ce39cbce08e48 100644 (file)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -194,16 +194,13 @@ void device_pm_move_last(struct device *dev)
 
 static ktime_t initcall_debug_start(struct device *dev)
 {
-       ktime_t calltime = 0;
-
-       if (pm_print_times_enabled) {
-               pr_info("calling  %s+ @ %i, parent: %s\n",
-                       dev_name(dev), task_pid_nr(current),
-                       dev->parent ? dev_name(dev->parent) : "none");
-               calltime = ktime_get();
-       }
+       if (!pm_print_times_enabled)
+               return 0;
 
-       return calltime;
+       pr_info("calling  %s+ @ %i, parent: %s\n",
+               dev_name(dev), task_pid_nr(current),
+               dev->parent ? dev_name(dev->parent) : "none");
+       return ktime_get();
 }
 
 static void initcall_debug_report(struct device *dev, ktime_t calltime,
@@ -212,13 +209,14 @@ static void initcall_debug_report(struct device *dev, ktime_t calltime,
        ktime_t rettime;
        s64 nsecs;
 
+       if (!pm_print_times_enabled)
+               return;
+
        rettime = ktime_get();
        nsecs = (s64) ktime_to_ns(ktime_sub(rettime, calltime));
 
-       if (pm_print_times_enabled) {
-               pr_info("call %s+ returned %d after %Ld usecs\n", dev_name(dev),
-                       error, (unsigned long long)nsecs >> 10);
-       }
+       pr_info("call %s+ returned %d after %Ld usecs\n", dev_name(dev),
+               error, (unsigned long long)nsecs >> 10);
 }
 
 /**