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

Commit 112e7546 authored by Timur Tabi's avatar Timur Tabi Committed by Wim Van Sebroeck
Browse files

watchdog: booke_wdt: clean up status messages 



Improve the status messages that are displayed during some operations of the
PowerPC watchdog timer driver.  When the watchdog is enabled, the timeout is
displayed as a number of seconds, instead of an obscure "period".  The "period"
is the position of a bit in a 64-bit timer register.  The higher the value,
the quicker the watchdog timeout occurs.  Some people chose a high "period"
value for the timer and get confused as to why the board resets within a
few seconds.

Messages displayed during open and close are now debug messages, so that they
don't clutter the console by default.  Finally, printk() is replaced with the
pr_xxx() equivalent.

Signed-off-by: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 5f3b2756

drivers/watchdog/booke_wdt.c

+9 −10
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Author: Matthew McClintock

 * Maintainer: Kumar Gala <galak@kernel.crashing.org>

 *

 * Copyright 2005, 2008, 2010 Freescale Semiconductor Inc.

 * Copyright 2005, 2008, 2010-2011 Freescale Semiconductor Inc.

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the
@@ -221,9 +221,8 @@ static int booke_wdt_open(struct inode *inode, struct file *file) 
	if (booke_wdt_enabled == 0) {

		booke_wdt_enabled = 1;

		on_each_cpu(__booke_wdt_enable, NULL, 0);

		printk(KERN_INFO

		      "PowerPC Book-E Watchdog Timer Enabled (wdt_period=%d)\n",

				booke_wdt_period);

		pr_debug("booke_wdt: watchdog enabled (timeout = %llu sec)\n",

			period_to_sec(booke_wdt_period));

	}

	spin_unlock(&booke_wdt_lock);
@@ -240,6 +239,7 @@ static int booke_wdt_release(struct inode *inode, struct file *file) 
	 */

	on_each_cpu(__booke_wdt_disable, NULL, 0);

	booke_wdt_enabled = 0;

	pr_debug("booke_wdt: watchdog disabled\n");

#endif



	clear_bit(0, &wdt_is_active);
@@ -271,21 +271,20 @@ static int __init booke_wdt_init(void) 
{

	int ret = 0;



	printk(KERN_INFO "PowerPC Book-E Watchdog Timer Loaded\n");

	pr_info("booke_wdt: powerpc book-e watchdog driver loaded\n");

	ident.firmware_version = cur_cpu_spec->pvr_value;



	ret = misc_register(&booke_wdt_miscdev);

	if (ret) {

		printk(KERN_CRIT "Cannot register miscdev on minor=%d: %d\n",

		pr_err("booke_wdt: cannot register device (minor=%u, ret=%i)\n",

		       WATCHDOG_MINOR, ret);

		return ret;

	}



	spin_lock(&booke_wdt_lock);

	if (booke_wdt_enabled == 1) {

		printk(KERN_INFO

		      "PowerPC Book-E Watchdog Timer Enabled (wdt_period=%d)\n",

				booke_wdt_period);

		pr_info("booke_wdt: watchdog enabled (timeout = %llu sec)\n",

			period_to_sec(booke_wdt_period));

		on_each_cpu(__booke_wdt_enable, NULL, 0);

	}

	spin_unlock(&booke_wdt_lock);