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

5 files changed, 10 insertions, 13 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.
+structure.
 
 Passed by reference.
 
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c
index e3cc72c81311..2c9988fef656 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.c
+++ b/drivers/clk/renesas/renesas-cpg-mssr.c
@@ -258,8 +258,9 @@ struct clk *cpg_mssr_clk_src_twocell_get(struct of_phandle_args *clkspec,
                 dev_err(dev, "Cannot get %s clock %u: %ld", type, clkidx,
                        PTR_ERR(clk));
         else
-                dev_dbg(dev, "clock (%u, %u) is %pC at %pCr Hz\n",
-                        clkspec->args[0], clkspec->args[1], clk, clk);
+                dev_dbg(dev, "clock (%u, %u) is %pC at %lu Hz\n",
+                        clkspec->args[0], clkspec->args[1], clk,
+                        clk_get_rate(clk));
         return clk;
 }
 
@@ -326,7 +327,7 @@ static void __init cpg_mssr_register_core_clk(const struct cpg_core_clk *core,
         if (IS_ERR_OR_NULL(clk))
                 goto fail;
 
-        dev_dbg(dev, "Core clock %pC at %pCr Hz\n", clk, clk);
+        dev_dbg(dev, "Core clock %pC at %lu Hz\n", clk, clk_get_rate(clk));
         priv->clks[id] = clk;
         return;
 
@@ -392,7 +393,7 @@ static void __init cpg_mssr_register_mod_clk(const struct mssr_mod_clk *mod,
         if (IS_ERR(clk))
                 goto fail;
 
-        dev_dbg(dev, "Module clock %pC at %pCr Hz\n", clk, clk);
+        dev_dbg(dev, "Module clock %pC at %lu Hz\n", clk, clk_get_rate(clk));
         priv->clks[id] = clk;
         priv->smstpcr_saved[clock->index / 32].mask |= BIT(clock->index % 32);
         return;
diff --git a/drivers/thermal/broadcom/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c
index a4d6a0e2e993..23ad4f9f2143 100644
--- a/drivers/thermal/broadcom/bcm2835_thermal.c
+++ b/drivers/thermal/broadcom/bcm2835_thermal.c
@@ -213,8 +213,8 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
         rate = clk_get_rate(data->clk);
         if ((rate < 1920000) || (rate > 5000000))
                 dev_warn(&pdev->dev,
-                         "Clock %pCn running at %pCr Hz is outside of the recommended range: 1.92 to 5MHz\n",
-                         data->clk, data->clk);
+                         "Clock %pCn running at %lu Hz is outside of the recommended range: 1.92 to 5MHz\n",
+                         data->clk, rate);
 
         /* register of thermal sensor and get info from DT */
         tz = thermal_zone_of_sensor_register(&pdev->dev, 0, data,
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index fdbbff547106..a4f82ec665fe 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -2704,8 +2704,8 @@ found:
                         dev_dbg(dev, "failed to get %s (%ld)\n", clk_names[i],
                                 PTR_ERR(clk));
                 else
-                        dev_dbg(dev, "clk %s is %pC rate %pCr\n", clk_names[i],
-                                clk, clk);
+                        dev_dbg(dev, "clk %s is %pC rate %lu\n", clk_names[i],
+                                clk, clk_get_rate(clk));
                 sci_port->clks[i] = IS_ERR(clk) ? NULL : clk;
         }
         return 0;
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 7649ef4ed7d0..8999202ad43b 100644
--- 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