Merge tag 'drm-coc-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux

[mirror_ubuntu-bionic-kernel.git] / drivers / clocksource / timer-nps.c

diff --git a/drivers/clocksource/timer-nps.c b/drivers/clocksource/timer-nps.c
index da1f7986e477eb18a2a7cd8bef365cc72d07808c..e74ea1722ad3a3c5dcb014cdee289e214457189a 100644 (file)
--- a/drivers/clocksource/timer-nps.c
+++ b/drivers/clocksource/timer-nps.c
@@ -55,7 +55,7 @@ static int __init nps_get_timer_clk(struct device_node *node,
        *clk = of_clk_get(node, 0);
        ret = PTR_ERR_OR_ZERO(*clk);
        if (ret) {
-               pr_err("timer missing clk");
+               pr_err("timer missing clk\n");
                return ret;
        }
 
@@ -247,7 +247,7 @@ static int __init nps_setup_clockevent(struct device_node *node)
 
        nps_timer0_irq = irq_of_parse_and_map(node, 0);
        if (nps_timer0_irq <= 0) {
-               pr_err("clockevent: missing irq");
+               pr_err("clockevent: missing irq\n");
                return -EINVAL;
        }
 
@@ -270,7 +270,7 @@ static int __init nps_setup_clockevent(struct device_node *node)
                                nps_timer_starting_cpu,
                                nps_timer_dying_cpu);
        if (ret) {
-               pr_err("Failed to setup hotplug state");
+               pr_err("Failed to setup hotplug state\n");
                clk_disable_unprepare(clk);
                free_percpu_irq(nps_timer0_irq, &nps_clockevent_device);
                return ret;