Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog updates from Wim Van Sebroeck:
 - Removal of the Documentation/watchdog/00-INDEX file
 - Fix boot status reporting for imx2_wdt
 - clean-up sp805_wdt, pnx4008_wdt and mpcore_wdt
 - convert printk in watchdog drivers to pr_ functions
 - change nowayout module parameter to bool for every watchdog device
 - conversion of jz4740_wdt, pnx4008_wdt, max63xx_wdt, softdog,
   ep93xx_wdt, coh901327 and txx9wdt to new watchdog API
 - Add support for the WDIOC_GETTIMELEFT ioctl call to the new watchdog
   API
 - Change the new watchdog API so that the driver updates the timeout
   value
 - two fixes for the xen_wdt driver

Fix up conflicts in ep93xx driver due to the same patches being merged
through separate branches.

* git://www.linux-watchdog.org/linux-watchdog: (33 commits)
  watchdog: txx9wdt: fix timeout
  watchdog: Convert txx9wdt driver to watchdog framework
  watchdog: coh901327_wdt.c: fix timeout
  watchdog: coh901327: convert to use watchdog core
  watchdog: Add support for WDIOC_GETTIMELEFT IOCTL in watchdog core
  watchdog: ep93xx_wdt: timeout is an unsigned int value.
  watchdog: ep93xx_wdt: Fix timeout after conversion to watchdog core
  watchdog: Convert ep93xx driver to watchdog core
  watchdog: sp805: Use devm routines
  watchdog: sp805: replace readl/writel with lighter _relaxed variants
  watchdog: sp805: Fix documentation style comment
  watchdog: mpcore_wdt: Allow platform_get_irq() to fail
  watchdog: mpcore_wdt: Use devm routines
  watchdog: mpcore_wdt: Rename dev to pdev for pointing to struct platform_device
  watchdog: xen: don't clear is_active when xen_wdt_stop() failed
  watchdog: xen: don't unconditionally enable the watchdog during resume
  watchdog: fix compiler error for missing parenthesis
  watchdog: ep93xx_wdt.c: fix platform probe
  watchdog: ep93xx: Convert the watchdog driver into a platform device.
  watchdog: fix set_timeout operations
  ...

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index 1b793dfd868f..95b1b954de1b 100644
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -14,6 +14,8 @@
  * Copyright (C) 2008 David S. Miller <davem@davemloft.net>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/fs.h>
@@ -35,7 +37,6 @@
 #include <asm/watchdog.h>
 
 #define DRIVER_NAME     "cpwd"
-#define PFX             DRIVER_NAME ": "
 
 #define WD_OBPNAME      "watchdog"
 #define WD_BADMODEL     "SUNW,501-5336"
@@ -385,8 +386,7 @@ static int cpwd_open(struct inode *inode, struct file *f)
         if (!p->initialized) {
                 if (request_irq(p->irq, &cpwd_interrupt,
                                 IRQF_SHARED, DRIVER_NAME, p)) {
-                        printk(KERN_ERR PFX "Cannot register IRQ %d\n",
-                                p->irq);
+                        pr_err("Cannot register IRQ %d\n", p->irq);
                         mutex_unlock(&cpwd_mutex);
                         return -EBUSY;
                 }
@@ -542,7 +542,7 @@ static int __devinit cpwd_probe(struct platform_device *op)
         p = kzalloc(sizeof(*p), GFP_KERNEL);
         err = -ENOMEM;
         if (!p) {
-                printk(KERN_ERR PFX "Unable to allocate struct cpwd.\n");
+                pr_err("Unable to allocate struct cpwd\n");
                 goto out;
         }
 
@@ -553,14 +553,14 @@ static int __devinit cpwd_probe(struct platform_device *op)
         p->regs = of_ioremap(&op->resource[0], 0,
                              4 * WD_TIMER_REGSZ, DRIVER_NAME);
         if (!p->regs) {
-                printk(KERN_ERR PFX "Unable to map registers.\n");
+                pr_err("Unable to map registers\n");
                 goto out_free;
         }
 
         options = of_find_node_by_path("/options");
         err = -ENODEV;
         if (!options) {
-                printk(KERN_ERR PFX "Unable to find /options node.\n");
+                pr_err("Unable to find /options node\n");
                 goto out_iounmap;
         }
 
@@ -605,8 +605,8 @@ static int __devinit cpwd_probe(struct platform_device *op)
 
                 err = misc_register(&p->devs[i].misc);
                 if (err) {
-                        printk(KERN_ERR "Could not register misc device for "
-                               "dev %d\n", i);
+                        pr_err("Could not register misc device for dev %d\n",
+                               i);
                         goto out_unregister;
                 }
         }
@@ -617,8 +617,8 @@ static int __devinit cpwd_probe(struct platform_device *op)
                 cpwd_timer.data         = (unsigned long) p;
                 cpwd_timer.expires      = WD_BTIMEOUT;
 
-                printk(KERN_INFO PFX "PLD defect workaround enabled for "
-                       "model " WD_BADMODEL ".\n");
+                pr_info("PLD defect workaround enabled for model %s\n",
+                        WD_BADMODEL);
         }
 
         dev_set_drvdata(&op->dev, p);