Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45bbfe64 authored by Joe Perches's avatar Joe Perches Committed by Thomas Gleixner
Browse files

clocksource: Use current logging style 



clocksource messages aren't prefixed in dmesg so it's a bit unclear
what subsystem emits the messages.

Use pr_fmt and pr_<level> to auto-prefix the messages appropriately.

Miscellanea:

o Remove "Warning" from KERN_WARNING level messages
o Align "timekeeping watchdog: " messages
o Coalesce formats
o Align multiline arguments

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: John Stultz <john.stultz@linaro.org>
Link: http://lkml.kernel.org/r/1432579795.2846.75.camel@perches.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent c569a23d

kernel/time/clocksource.c

+12 −12
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
 *   o Allow clocksource drivers to be unregistered

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/device.h>

#include <linux/clocksource.h>

#include <linux/init.h>
@@ -216,7 +218,8 @@ static void clocksource_watchdog(unsigned long data) 


		/* Check the deviation from the watchdog clocksource. */

		if ((abs(cs_nsec - wd_nsec) > WATCHDOG_THRESHOLD)) {

			pr_warn("timekeeping watchdog: Marking clocksource '%s' as unstable, because the skew is too large:\n", cs->name);

			pr_warn("timekeeping watchdog: Marking clocksource '%s' as unstable because the skew is too large:\n",

				cs->name);

			pr_warn("                      '%s' wd_now: %llx wd_last: %llx mask: %llx\n",

				watchdog->name, wdnow, wdlast, watchdog->mask);

			pr_warn("                      '%s' cs_now: %llx cs_last: %llx mask: %llx\n",
@@ -567,9 +570,8 @@ static void __clocksource_select(bool skipcur) 
		 */

		if (!(cs->flags & CLOCK_SOURCE_VALID_FOR_HRES) && oneshot) {

			/* Override clocksource cannot be used. */

			printk(KERN_WARNING "Override clocksource %s is not "

			       "HRT compatible. Cannot switch while in "

			       "HRT/NOHZ mode\n", cs->name);

			pr_warn("Override clocksource %s is not HRT compatible - cannot switch while in HRT/NOHZ mode\n",

				cs->name);

			override_name[0] = 0;

		} else

			/* Override clocksource can be used. */
@@ -708,7 +710,7 @@ void __clocksource_update_freq_scale(struct clocksource *cs, u32 scale, u32 freq 


	clocksource_update_max_deferment(cs);



	pr_info("clocksource %s: mask: 0x%llx max_cycles: 0x%llx, max_idle_ns: %lld ns\n",

	pr_info("%s: mask: 0x%llx max_cycles: 0x%llx, max_idle_ns: %lld ns\n",

		cs->name, cs->mask, cs->max_cycles, cs->max_idle_ns);

}

EXPORT_SYMBOL_GPL(__clocksource_update_freq_scale);
@@ -1008,12 +1010,10 @@ __setup("clocksource=", boot_override_clocksource); 
static int __init boot_override_clock(char* str)

{

	if (!strcmp(str, "pmtmr")) {

		printk("Warning: clock=pmtmr is deprecated. "

			"Use clocksource=acpi_pm.\n");

		pr_warn("clock=pmtmr is deprecated - use clocksource=acpi_pm\n");

		return boot_override_clocksource("acpi_pm");

	}

	printk("Warning! clock= boot option is deprecated. "

		"Use clocksource=xyz\n");

	pr_warn("clock= boot option is deprecated - use clocksource=xyz\n");

	return boot_override_clocksource(str);

}