Skip to content

Commit

Permalink
clockevents: Fix kernel messages split across multiple lines
Browse files Browse the repository at this point in the history
Convert the clockevents driver from old-style printk() to pr_info() and
pr_cont(), to fix split kernel messages like below:

    Clockevents: could not switch to one-shot mode:
     dummy_timer is not functional.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: https://lkml.kernel.org/r/1522942018-14471-1-git-send-email-geert%2Brenesas@glider.be
  • Loading branch information
Geert Uytterhoeven authored and Thomas Gleixner committed Apr 17, 2018
1 parent a27fc14 commit 4450dc0
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions kernel/time/tick-oneshot.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,15 @@ int tick_switch_to_oneshot(void (*handler)(struct clock_event_device *))
if (!dev || !(dev->features & CLOCK_EVT_FEAT_ONESHOT) ||
!tick_device_is_functional(dev)) {

printk(KERN_INFO "Clockevents: "
"could not switch to one-shot mode:");
pr_info("Clockevents: could not switch to one-shot mode:");
if (!dev) {
printk(" no tick device\n");
pr_cont(" no tick device\n");
} else {
if (!tick_device_is_functional(dev))
printk(" %s is not functional.\n", dev->name);
pr_cont(" %s is not functional.\n", dev->name);
else
printk(" %s does not support one-shot mode.\n",
dev->name);
pr_cont(" %s does not support one-shot mode.\n",
dev->name);
}
return -EINVAL;
}
Expand Down

0 comments on commit 4450dc0

Please sign in to comment.