[PATCH 1/1] [Blackfin] Watchdog driver: relocate all strings used in __init functions to __initdata

[Bryan Wu]

From: Mike Frysinger <[EMAIL PROTECTED]>

Signed-off-by: Mike Frysinger <[EMAIL PROTECTED]>
Signed-off-by: Bryan Wu <[EMAIL PROTECTED]>
---
 drivers/watchdog/bfin_wdt.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
index 472be10..1237113 100644
--- a/drivers/watchdog/bfin_wdt.c
+++ b/drivers/watchdog/bfin_wdt.c
@@ -29,6 +29,7 @@
 
 #define stamp(fmt, args...) pr_debug("%s:%i: " fmt "\n", __func__, __LINE__, 
## args)
 #define stampit() stamp("here i am")
+#define pr_init(fmt, args...) ({ static const __initdata char __fmt[] = fmt; 
printk(__fmt, ## args); })
 
 #define WATCHDOG_NAME "bfin-wdt"
 #define PFX WATCHDOG_NAME ": "
@@ -445,19 +446,19 @@ static int __init bfin_wdt_init(void)
 
        ret = register_reboot_notifier(&bfin_wdt_notifier);
        if (ret) {
-               printk(KERN_ERR PFX "cannot register reboot notifier 
(err=%d)\n", ret);
+               pr_init(KERN_ERR PFX "cannot register reboot notifier 
(err=%d)\n", ret);
                return ret;
        }
 
        ret = misc_register(&bfin_wdt_miscdev);
        if (ret) {
-               printk(KERN_ERR PFX "cannot register miscdev on minor=%d 
(err=%d)\n",
+               pr_init(KERN_ERR PFX "cannot register miscdev on minor=%d 
(err=%d)\n",
                       WATCHDOG_MINOR, ret);
                unregister_reboot_notifier(&bfin_wdt_notifier);
                return ret;
        }
 
-       printk(KERN_INFO PFX "initialized: timeout=%d sec (nowayout=%d)\n",
+       pr_init(KERN_INFO PFX "initialized: timeout=%d sec (nowayout=%d)\n",
               timeout, nowayout);
 
        return 0;
-- 
1.5.3.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/