Commit 5b9eda2b authored by Len Brown's avatar Len Brown Committed by Rafael J. Wysocki
Browse files

PM: sleep: Take advantage of %ps to simplify debug output 



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: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 3642c7ed

drivers/base/power/main.c

+3 −3
Original line number Diff line number Diff line
@@ -208,7 +208,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();
@@ -223,7 +223,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));

}
@@ -1927,7 +1927,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);