From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758598AbbIVR1W (ORCPT ); Tue, 22 Sep 2015 13:27:22 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:33721 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757953AbbIVR1G (ORCPT ); Tue, 22 Sep 2015 13:27:06 -0400 From: Douglas Anderson To: rjw@rjwysocki.net Cc: Dmitry Torokhov , Douglas Anderson , pavel@ucw.cz, len.brown@intel.com, gregkh@linuxfoundation.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] power: print function name of callbacks Date: Tue, 22 Sep 2015 10:26:37 -0700 Message-Id: <1442942797-17433-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.6.0.rc0.131.gf624c3d Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The printouts writen to the logs by suspend can be a bit opaque: it can be hard to track them down to the actual function called. You might see: calling rfkill1+ @ 19473, parent: phy0 call rfkill1+ returned 0 after 1 usecs calling phy0+ @ 19473, parent: mmc2:0001:1 call phy0+ returned 0 after 19 usecs It's a bit hard to know what's actually happening. Instead, it's nice to see: calling rfkill1+ @ 15793, parent: phy0, cb: rfkill_suspend call rfkill1+ returned 0 after 1 usecs calling phy0+ @ 15793, parent: mmc2:0001:1, cb: wiphy_suspend [cfg80211] call phy0+ returned 0 after 7 usecs That makes it very obvious what's going on. It also has the nice side effect of making the suspend/resume spew a little more obvious, since many resume functions have the word "resume" in the name: calling phy0+ @ 15793, parent: mmc2:0001:1, cb: wiphy_resume [cfg80211] call phy0+ returned 0 after 12 usecs calling rfkill1+ @ 15793, parent: phy0, cb: rfkill_resume call rfkill1+ returned 0 after 1 usecs Signed-off-by: Douglas Anderson --- drivers/base/power/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 1710c26..e2b1f14 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -188,14 +188,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(); } @@ -382,7 +382,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); @@ -1324,7 +1324,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); -- 2.6.0.rc0.131.gf624c3d