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

Commit 77e0dfcc authored by Joe Perches's avatar Joe Perches Committed by Wim Van Sebroeck
Browse files

watchdog: Convert dev_printk(KERN_<LEVEL> to dev_<level>( 



dev_<level> calls take less code than dev_printk(KERN_<LEVEL>
and reducing object size is good.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 312b00e1

drivers/watchdog/mpcore_wdt.c

+9 −10
Original line number Diff line number Diff line
@@ -80,8 +80,7 @@ static irqreturn_t mpcore_wdt_fire(int irq, void *arg) 


	/* Check it really was our interrupt */

	if (readl(wdt->base + TWD_WDOG_INTSTAT)) {

		dev_printk(KERN_CRIT, wdt->dev,

					"Triggered - Reboot ignored.\n");

		dev_crit(wdt->dev, "Triggered - Reboot ignored\n");

		/* Clear the interrupt on the watchdog */

		writel(1, wdt->base + TWD_WDOG_INTSTAT);

		return IRQ_HANDLED;
@@ -123,7 +122,7 @@ static void mpcore_wdt_stop(struct mpcore_wdt *wdt) 


static void mpcore_wdt_start(struct mpcore_wdt *wdt)

{

	dev_printk(KERN_INFO, wdt->dev, "enabling watchdog.\n");

	dev_info(wdt->dev, "enabling watchdog\n");



	/* This loads the count register but does NOT start the count yet */

	mpcore_wdt_keepalive(wdt);
@@ -180,7 +179,7 @@ static int mpcore_wdt_release(struct inode *inode, struct file *file) 
	if (wdt->expect_close == 42)

		mpcore_wdt_stop(wdt);

	else {

		dev_printk(KERN_CRIT, wdt->dev,

		dev_crit(wdt->dev,

			 "unexpected close, not stopping watchdog!\n");

		mpcore_wdt_keepalive(wdt);

	}
@@ -351,7 +350,7 @@ static int mpcore_wdt_probe(struct platform_device *pdev) 
		ret = devm_request_irq(wdt->dev, wdt->irq, mpcore_wdt_fire, 0,

				"mpcore_wdt", wdt);

		if (ret) {

			dev_printk(KERN_ERR, wdt->dev,

			dev_err(wdt->dev,

				"cannot register IRQ%d for watchdog\n",

				wdt->irq);

			return ret;
@@ -365,7 +364,7 @@ static int mpcore_wdt_probe(struct platform_device *pdev) 
	mpcore_wdt_miscdev.parent = &pdev->dev;

	ret = misc_register(&mpcore_wdt_miscdev);

	if (ret) {

		dev_printk(KERN_ERR, wdt->dev,

		dev_err(wdt->dev,

			"cannot register miscdev on minor=%d (err=%d)\n",

			WATCHDOG_MINOR, ret);

		return ret;