watchdog: Use pr_<fmt> and pr_<level>

[deliverable/linux.git] / drivers / watchdog / riowd.c

diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index c7e17ceafa6aeca9b83f77edc41a4e372d068585..49e1b1c2135cdde2c00bfd37978c02d8ce62cfd1 100644 (file)
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -3,6 +3,8 @@
  * Copyright (C) 2001, 2008 David S. Miller (davem@davemloft.net)
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/types.h>
@@ -189,7 +191,7 @@ static int __devinit riowd_probe(struct platform_device *op)
 
        p->regs = of_ioremap(&op->resource[0], 0, 2, DRIVER_NAME);
        if (!p->regs) {
-               printk(KERN_ERR PFX "Cannot map registers.\n");
+               pr_err("Cannot map registers\n");
                goto out_free;
        }
        /* Make miscdev useable right away */
@@ -197,12 +199,12 @@ static int __devinit riowd_probe(struct platform_device *op)
 
        err = misc_register(&riowd_miscdev);
        if (err) {
-               printk(KERN_ERR PFX "Cannot register watchdog misc device.\n");
+               pr_err("Cannot register watchdog misc device\n");
                goto out_iounmap;
        }
 
-       printk(KERN_INFO PFX "Hardware watchdog [%i minutes], "
-              "regs at %p\n", riowd_timeout, p->regs);
+       pr_info("Hardware watchdog [%i minutes], regs at %p\n",
+               riowd_timeout, p->regs);
 
        dev_set_drvdata(&op->dev, p);
        return 0;