diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2018-04-05 11:26:58 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2018-04-17 11:18:04 -0400 |
commit | 4450dc0ae2c18a0ac6dce560215c7a1fa12122b5 (patch) | |
tree | b502663fbd23c1778377910f28864cd0bfbf7c80 | |
parent | a27fc14219f2e3c4a46ba9177b04d9b52c875532 (diff) |
clockevents: Fix kernel messages split across multiple lines
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
-rw-r--r-- | kernel/time/tick-oneshot.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel/time/tick-oneshot.c b/kernel/time/tick-oneshot.c index c1f518e7aa80..6fe615d57ebb 100644 --- a/kernel/time/tick-oneshot.c +++ b/kernel/time/tick-oneshot.c | |||
@@ -82,16 +82,15 @@ int tick_switch_to_oneshot(void (*handler)(struct clock_event_device *)) | |||
82 | if (!dev || !(dev->features & CLOCK_EVT_FEAT_ONESHOT) || | 82 | if (!dev || !(dev->features & CLOCK_EVT_FEAT_ONESHOT) || |
83 | !tick_device_is_functional(dev)) { | 83 | !tick_device_is_functional(dev)) { |
84 | 84 | ||
85 | printk(KERN_INFO "Clockevents: " | 85 | pr_info("Clockevents: could not switch to one-shot mode:"); |
86 | "could not switch to one-shot mode:"); | ||
87 | if (!dev) { | 86 | if (!dev) { |
88 | printk(" no tick device\n"); | 87 | pr_cont(" no tick device\n"); |
89 | } else { | 88 | } else { |
90 | if (!tick_device_is_functional(dev)) | 89 | if (!tick_device_is_functional(dev)) |
91 | printk(" %s is not functional.\n", dev->name); | 90 | pr_cont(" %s is not functional.\n", dev->name); |
92 | else | 91 | else |
93 | printk(" %s does not support one-shot mode.\n", | 92 | pr_cont(" %s does not support one-shot mode.\n", |
94 | dev->name); | 93 | dev->name); |
95 | } | 94 | } |
96 | return -EINVAL; | 95 | return -EINVAL; |
97 | } | 96 | } |