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: Joe Perches <joe@perches.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Родитель
312b00e1c3
Коммит
77e0dfcc09
|
@ -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,8 +179,8 @@ 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,
|
||||
"unexpected close, not stopping watchdog!\n");
|
||||
dev_crit(wdt->dev,
|
||||
"unexpected close, not stopping watchdog!\n");
|
||||
mpcore_wdt_keepalive(wdt);
|
||||
}
|
||||
clear_bit(0, &wdt->timer_alive);
|
||||
|
@ -351,9 +350,9 @@ 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,
|
||||
"cannot register IRQ%d for watchdog\n",
|
||||
wdt->irq);
|
||||
dev_err(wdt->dev,
|
||||
"cannot register IRQ%d for watchdog\n",
|
||||
wdt->irq);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
@ -365,9 +364,9 @@ 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);
|
||||
WATCHDOG_MINOR, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче