diff options
authorGeert Uytterhoeven <>2018-06-01 11:28:22 +0200
committerPetr Mladek <>2018-06-05 09:43:39 +0200
commit666902e42fd8344b923c02dc5b0f37948ff4f225 (patch)
parentd63c16f8e1ab761775275adcf54f4bef7c330295 (diff)
lib/vsprintf: Remove atomic-unsafe support for %pCr
"%pCr" formats the current rate of a clock, and calls clk_get_rate(). The latter obtains a mutex, hence it must not be called from atomic context. Remove support for this rarely-used format, as vsprintf() (and e.g. printk()) must be callable from any context. Any remaining out-of-tree users will start seeing the clock's name printed instead of its rate. Reported-by: Jia-Ju Bai <> Fixes: 900cca2944254edd ("lib/vsprintf: add %pC{,n,r} format specifiers for clocks") Link: To: Jia-Ju Bai <> To: Jonathan Corbet <> To: Michael Turquette <> To: Stephen Boyd <> To: Zhang Rui <> To: Eduardo Valentin <> To: Eric Anholt <> To: Stefan Wahren <> To: Greg Kroah-Hartman <> Cc: Sergey Senozhatsky <> Cc: Petr Mladek <> Cc: Linus Torvalds <> Cc: Steven Rostedt <> Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Geert Uytterhoeven <> Cc: # 4.1+ Signed-off-by: Geert Uytterhoeven <> Signed-off-by: Petr Mladek <>
2 files changed, 1 insertions, 5 deletions
diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst
index eb30efdd2e78..25dc591cb110 100644
--- a/Documentation/core-api/printk-formats.rst
+++ b/Documentation/core-api/printk-formats.rst
@@ -419,11 +419,10 @@ struct clk
%pC pll1
%pCn pll1
- %pCr 1560000000
For printing struct clk structures. %pC and %pCn print the name
(Common Clock Framework) or address (legacy clock framework) of the
-structure; %pCr prints the current clock rate.
Passed by reference.
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index d7a708f82559..8f28036f5c1d 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1446,9 +1446,6 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec,
return string(buf, end, NULL, spec);
switch (fmt[1]) {
- case 'r':
- return number(buf, end, clk_get_rate(clk), spec);
case 'n':