summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2019-07-01 16:00:09 +0200
committerPetr Mladek <pmladek@suse.com>2019-07-04 12:45:14 +0200
commit4ca96aa99f3e1e530f63559c0cc63ae186ecd677 (patch)
treecae124e7c3874d48f69d8414c236a1513ceed37a /lib
parentb314dd49a28a38997aa8f472d02f0631a830d37a (diff)
downloadlinux-4ca96aa99f3e1e530f63559c0cc63ae186ecd677.tar.bz2
lib/vsprintf: Reinstate printing of legacy clock IDs
When using the legacy clock framework, clock pointers are no longer printed as IDs, as the !CONFIG_COMMON_CLK case was accidentally considered an error case. Fix this by reverting to the old behavior, which allows to distinguish clocks by ID, as the legacy clock framework does not store names with clocks. Fixes: 0b74d4d763fd4ee9 ("vsprintf: Consolidate handling of unknown pointer specifiers") Link: http://lkml.kernel.org/r/20190701140009.23683-1-geert+renesas@glider.be Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: linux-kernel@vger.kernel.org Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Petr Mladek <pmladek@suse.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/vsprintf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 25b8f4f040c0..431f4974b17b 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1798,7 +1798,7 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec,
#ifdef CONFIG_COMMON_CLK
return string(buf, end, __clk_get_name(clk), spec);
#else
- return error_string(buf, end, "(%pC?)", spec);
+ return ptr_to_id(buf, end, clk, spec);
#endif
}
}