Merge branch 'for-4.18-vsprintf-pcr-removal' into for-4.18

2018-06-05 13:39:12 +02:00
parent bcf8677bc6 666902e42f
commit 8bafa2a44f
5 changed files with 10 additions and 13 deletions
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1459,9 +1459,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':
 	default:
 #ifdef CONFIG_COMMON_CLK