On Fri, 2013-06-14 at 14:35 -0600, Shuah Khan wrote: > Change __device_suspend() path to include driver name and the ops that > get run for a device. This additional information helps associate the > driver and the type of pm_ops the device uses in the suspend path very > quickly which will aid in debugging problems in suspend and resume paths. > Changed both start and end debug messages to include pm_ops information > and use dev_info() instead of pr_info(). > > dmesg output before the change: > > [ 164.390032] calling 1-1+ @ 69, parent: usb1 > [ 164.390035] call 1-1+ returned 0 after 0 usecs
> dmesg output after the change: > > [ 58.707002] usb usb1: calling type pm ops @ 57, parent: 0000:00:1d.0 > [ 58.707641] usb usb1: call type pm ops returned 0 after 611 usecs > diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c [] > +static ktime_t initcall_debug_start(struct device *dev, char *info) [] > + /* string in info has an extra space at the end */ > + dev_info(dev, "calling %s@ %i, parent: %s\n", > + info, task_pid_nr(current), > dev->parent ? dev_name(dev->parent) : "none"); > static void initcall_debug_report(struct device *dev, ktime_t calltime, [] > - pr_info("call %s+ returned %d after %Ld usecs\n", dev_name(dev), > + /* string in info has an extra space at the end */ > + dev_info(dev, "call %sreturned %d after %llu usecs\n", info, > error, (unsigned long long)ktime_to_ns(delta) >> 10); Perhaps align the "calling and "call" and include task_pid_nr(current)? [ 58.707002] usb usb1: calling type pm ops @ 57, parent: 0000:00:1d.0 [ 58.707641] usb usb1: call type pm ops returned 0 after 611 usecs so it's: [ 58.707002] usb usb1: enter 'type pm ops' @ 57, parent: 0000:00:1d.0 [ 58.707641] usb usb1: exit 'type pm ops' @ 57, parent: 0000:00:1d.0, error: 0 (611 usecs) or: [ 58.707002] usb usb1: enter 'type pm ops' @ 57, parent: 0000:00:1d.0 [ 58.707641] usb usb1: exit 'type pm ops' @ 57, error: 0 (611 usecs) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/