| Message ID | 2aaa9ba442f027fd9d1011c5fb30adea9bd1b799.1712344255.git.len.brown@intel.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [1/1] pm: Take advantage of %ps to simplify debug output | expand |
On Fri, Apr 5, 2024 at 9:13 PM Len Brown <lenb@kernel.org> wrote: > > From: Len Brown <len.brown@intel.com> > > initcall_debug previous and new output: > > ...PM: calling pci_pm_suspend+0x0/0x1b0 @ 3233, parent: pci0000:00 > > ...PM: calling pci_pm_suspend @ 3233, parent: pci0000:00 > > Signed-off-by: Len Brown <len.brown@intel.com> > --- > drivers/base/power/main.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c > index f85f3515c258..de581c33095f 100644 > --- a/drivers/base/power/main.c > +++ b/drivers/base/power/main.c > @@ -209,7 +209,7 @@ static ktime_t initcall_debug_start(struct device *dev, void *cb) > if (!pm_print_times_enabled) > return 0; > > - dev_info(dev, "calling %pS @ %i, parent: %s\n", cb, > + dev_info(dev, "calling %ps @ %i, parent: %s\n", cb, > task_pid_nr(current), > dev->parent ? dev_name(dev->parent) : "none"); > return ktime_get(); > @@ -224,7 +224,7 @@ static void initcall_debug_report(struct device *dev, ktime_t calltime, > return; > > rettime = ktime_get(); > - dev_info(dev, "%pS returned %d after %Ld usecs\n", cb, error, > + dev_info(dev, "%ps returned %d after %Ld usecs\n", cb, error, > (unsigned long long)ktime_us_delta(rettime, calltime)); > } > > @@ -1963,7 +1963,7 @@ EXPORT_SYMBOL_GPL(dpm_suspend_start); > void __suspend_report_result(const char *function, struct device *dev, void *fn, int ret) > { > if (ret) > - dev_err(dev, "%s(): %pS returns %d\n", function, fn, ret); > + dev_err(dev, "%s(): %ps returns %d\n", function, fn, ret); > } > EXPORT_SYMBOL_GPL(__suspend_report_result); > > -- Applied as 6.10 material, thanks!
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index f85f3515c258..de581c33095f 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -209,7 +209,7 @@ static ktime_t initcall_debug_start(struct device *dev, void *cb) if (!pm_print_times_enabled) return 0; - dev_info(dev, "calling %pS @ %i, parent: %s\n", cb, + dev_info(dev, "calling %ps @ %i, parent: %s\n", cb, task_pid_nr(current), dev->parent ? dev_name(dev->parent) : "none"); return ktime_get(); @@ -224,7 +224,7 @@ static void initcall_debug_report(struct device *dev, ktime_t calltime, return; rettime = ktime_get(); - dev_info(dev, "%pS returned %d after %Ld usecs\n", cb, error, + dev_info(dev, "%ps returned %d after %Ld usecs\n", cb, error, (unsigned long long)ktime_us_delta(rettime, calltime)); } @@ -1963,7 +1963,7 @@ EXPORT_SYMBOL_GPL(dpm_suspend_start); void __suspend_report_result(const char *function, struct device *dev, void *fn, int ret) { if (ret) - dev_err(dev, "%s(): %pS returns %d\n", function, fn, ret); + dev_err(dev, "%s(): %ps returns %d\n", function, fn, ret); } EXPORT_SYMBOL_GPL(__suspend_report_result);