Commit 592ebd77 authored by Luca Ceresoli's avatar Luca Ceresoli Committed by Daniel Lezcano
Browse files

vsprintf: remove redundant and unused %pCn format specifier 



%pC and %pCn print the same string, and commit 900cca29 ("lib/vsprintf:
add %pC{,n,r} format specifiers for clocks") introducing them does not
clarify any intended difference. It can be assumed %pC is a default for
%pCn as some other specifiers do, but not all are consistent with this
policy. Moreover there is now no other suffix other than 'n', which makes a
default not really useful.

All users in the kernel were using %pC except for one which has been
converted. So now remove %pCn and all the unnecessary extra code and
documentation.

Acked-by: default avatarStephen Boyd <sboyd@kernel.org>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarLuca Ceresoli <luca.ceresoli@bootlin.com>
Reviewed-by: default avatarPetr Mladek <pmladek@suse.com>
Tested-by: default avatarPetr Mladek <pmladek@suse.com>
Reviewed-by: default avatarYanteng Si <si.yanteng@linux.dev>
Link: https://lore.kernel.org/r/20250311-vsprintf-pcn-v2-2-0af40fc7dee4@bootlin.com


Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent b0d71cb4

Documentation/core-api/printk-formats.rst

+1 −2
Original line number Diff line number Diff line
@@ -571,9 +571,8 @@ struct clk 
::



	%pC	pll1

	%pCn	pll1



For printing struct clk structures. %pC and %pCn print the name of the clock

For printing struct clk structures. %pC prints the name of the clock

(Common Clock Framework) or a unique 32-bit ID (legacy clock framework).



Passed by reference.

Documentation/translations/zh_CN/core-api/printk-formats.rst

+1 −2
Original line number Diff line number Diff line
@@ -523,9 +523,8 @@ clk结构体 
::



	%pC	pll1

	%pCn	pll1



用于打印clk结构。%pC 和 %pCn 打印时钟的名称（通用时钟框架）或唯一的32位

用于打印clk结构。%pC 打印时钟的名称（通用时钟框架）或唯一的32位

ID（传统时钟框架）。



通过引用传递。

lib/vsprintf.c

+2 −8
Original line number Diff line number Diff line
@@ -1981,16 +1981,12 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec, 
	if (check_pointer(&buf, end, clk, spec))

		return buf;



	switch (fmt[1]) {

	case 'n':

	default:

#ifdef CONFIG_COMMON_CLK

	return string(buf, end, __clk_get_name(clk), spec);

#else

	return ptr_to_id(buf, end, clk, spec);

#endif

}

}



static

char *format_flags(char *buf, char *end, unsigned long flags,
@@ -2391,8 +2387,6 @@ early_param("no_hash_pointers", no_hash_pointers_enable); 
 *      T    time64_t

 * - 'C' For a clock, it prints the name (Common Clock Framework) or address

 *       (legacy clock framework) of the clock

 * - 'Cn' For a clock, it prints the name (Common Clock Framework) or address

 *        (legacy clock framework) of the clock

 * - 'G' For flags to be printed as a collection of symbolic strings that would

 *       construct the specific value. Supported flags given by option:

 *       p page flags (see struct page) given as pointer to unsigned long