clocksource/drivers/davinci: Avoid trailing '\n' hidden in pr_fmt()

pr_xxx() functions usually have '\n' at the end of the logging message.
Here, this '\n' is added via the 'pr_fmt' macro.

In order to be more consistent with other files, use a more standard
convention and put these '\n' back in the messages themselves and remove it
from the pr_fmt macro.

While at it, remove a useless message in case of 'kzalloc' failure,
especially with a __GFP_NOFAIL flag.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200409092543.14727-1-christophe.jaillet@wanadoo.fr

diff --git a/drivers/clocksource/timer-davinci.c b/drivers/clocksource/timer-davinci.c
index e421946..aae9383 100644 (file)
--- a/drivers/clocksource/timer-davinci.c
+++ b/drivers/clocksource/timer-davinci.c
@@ -18,7 +18,7 @@
 #include <clocksource/timer-davinci.h>
 
 #undef pr_fmt
-#define pr_fmt(fmt) "%s: " fmt "\n", __func__
+#define pr_fmt(fmt) "%s: " fmt, __func__
 
 #define DAVINCI_TIMER_REG_TIM12                        0x10
 #define DAVINCI_TIMER_REG_TIM34                        0x14
@@ -250,20 +250,20 @@ int __init davinci_timer_register(struct clk *clk,
 
        rv = clk_prepare_enable(clk);
        if (rv) {
-               pr_err("Unable to prepare and enable the timer clock");
+               pr_err("Unable to prepare and enable the timer clock\n");
                return rv;
        }
 
        if (!request_mem_region(timer_cfg->reg.start,
                                resource_size(&timer_cfg->reg),
                                "davinci-timer")) {
-               pr_err("Unable to request memory region");
+               pr_err("Unable to request memory region\n");
                return -EBUSY;
        }
 
        base = ioremap(timer_cfg->reg.start, resource_size(&timer_cfg->reg));
        if (!base) {
-               pr_err("Unable to map the register range");
+               pr_err("Unable to map the register range\n");
                return -ENOMEM;
        }
 
@@ -271,10 +271,8 @@ int __init davinci_timer_register(struct clk *clk,
        tick_rate = clk_get_rate(clk);
 
        clockevent = kzalloc(sizeof(*clockevent), GFP_KERNEL | __GFP_NOFAIL);
-       if (!clockevent) {
-               pr_err("Error allocating memory for clockevent data");
+       if (!clockevent)
                return -ENOMEM;
-       }
 
        clockevent->dev.name = "tim12";
        clockevent->dev.features = CLOCK_EVT_FEAT_ONESHOT;
@@ -298,7 +296,7 @@ int __init davinci_timer_register(struct clk *clk,
                         davinci_timer_irq_timer, IRQF_TIMER,
                         "clockevent/tim12", clockevent);
        if (rv) {
-               pr_err("Unable to request the clockevent interrupt");
+               pr_err("Unable to request the clockevent interrupt\n");
                return rv;
        }
 
@@ -325,7 +323,7 @@ int __init davinci_timer_register(struct clk *clk,
 
        rv = clocksource_register_hz(&davinci_clocksource.dev, tick_rate);
        if (rv) {
-               pr_err("Unable to register clocksource");
+               pr_err("Unable to register clocksource\n");
                return rv;
        }
 
@@ -343,20 +341,20 @@ static int __init of_davinci_timer_register(struct device_node *np)
 
        rv = of_address_to_resource(np, 0, &timer_cfg.reg);
        if (rv) {
-               pr_err("Unable to get the register range for timer");
+               pr_err("Unable to get the register range for timer\n");
                return rv;
        }
 
        rv = of_irq_to_resource_table(np, timer_cfg.irq,
                                      DAVINCI_TIMER_NUM_IRQS);
        if (rv != DAVINCI_TIMER_NUM_IRQS) {
-               pr_err("Unable to get the interrupts for timer");
+               pr_err("Unable to get the interrupts for timer\n");
                return rv;
        }
 
        clk = of_clk_get(np, 0);
        if (IS_ERR(clk)) {
-               pr_err("Unable to get the timer clock");
+               pr_err("Unable to get the timer clock\n");
                return PTR_ERR(clk);
        }