1 files changed, 12 insertions, 16 deletions

diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index b6a2b58cbe64..4397881c83f4 100644
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -52,6 +52,8 @@
  *      Includes, defines, variables, module parameters, ...
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 /* Includes */
 #include <linux/module.h>               /* For module specific items */
 #include <linux/moduleparam.h>          /* For new moduleparam's */
@@ -70,7 +72,6 @@
 
 /* Module information */
 #define DRV_NAME "acquirewdt"
-#define PFX DRV_NAME ": "
 #define WATCHDOG_NAME "Acquire WDT"
 /* There is no way to see what the correct time-out period is */
 #define WATCHDOG_HEARTBEAT 0
@@ -92,8 +93,8 @@ static int wdt_start = 0x443;
 module_param(wdt_start, int, 0);
 MODULE_PARM_DESC(wdt_start, "Acquire WDT 'start' io port (default 0x443)");
 
-static int nowayout = WATCHDOG_NOWAYOUT;
-module_param(nowayout, int, 0);
+static bool nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
         "Watchdog cannot be stopped once started (default="
         __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
@@ -208,8 +209,7 @@ static int acq_close(struct inode *inode, struct file *file)
         if (expect_close == 42) {
                 acq_stop();
         } else {
-                printk(KERN_CRIT PFX
-                        "Unexpected close, not stopping watchdog!\n");
+                pr_crit("Unexpected close, not stopping watchdog!\n");
                 acq_keepalive();
         }
         clear_bit(0, &acq_is_open);
@@ -246,27 +246,24 @@ static int __devinit acq_probe(struct platform_device *dev)
 
         if (wdt_stop != wdt_start) {
                 if (!request_region(wdt_stop, 1, WATCHDOG_NAME)) {
-                        printk(KERN_ERR PFX
-                            "I/O address 0x%04x already in use\n", wdt_stop);
+                        pr_err("I/O address 0x%04x already in use\n", wdt_stop);
                         ret = -EIO;
                         goto out;
                 }
         }
 
         if (!request_region(wdt_start, 1, WATCHDOG_NAME)) {
-                printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",
-                        wdt_start);
+                pr_err("I/O address 0x%04x already in use\n", wdt_start);
                 ret = -EIO;
                 goto unreg_stop;
         }
         ret = misc_register(&acq_miscdev);
         if (ret != 0) {
-                printk(KERN_ERR PFX
-                        "cannot register miscdev on minor=%d (err=%d)\n",
-                                                        WATCHDOG_MINOR, ret);
+                pr_err("cannot register miscdev on minor=%d (err=%d)\n",
+                       WATCHDOG_MINOR, ret);
                 goto unreg_regions;
         }
-        printk(KERN_INFO PFX "initialized. (nowayout=%d)\n", nowayout);
+        pr_info("initialized. (nowayout=%d)\n", nowayout);
 
         return 0;
 unreg_regions:
@@ -308,8 +305,7 @@ static int __init acq_init(void)
 {
         int err;
 
-        printk(KERN_INFO
-              "WDT driver for Acquire single board computer initialising.\n");
+        pr_info("WDT driver for Acquire single board computer initialising\n");
 
         err = platform_driver_register(&acquirewdt_driver);
         if (err)
@@ -332,7 +328,7 @@ static void __exit acq_exit(void)
 {
         platform_device_unregister(acq_platform_device);
         platform_driver_unregister(&acquirewdt_driver);
-        printk(KERN_INFO PFX "Watchdog Module Unloaded.\n");
+        pr_info("Watchdog Module Unloaded\n");
 }
 
 module_init(acq_init);