diff options
author | Mike Frysinger <michael.frysinger@analog.com> | 2008-01-30 04:38:21 -0500 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2008-02-18 11:54:11 -0500 |
commit | bb59b5578a73d0e0e4e208a014fa7ea0c4f0ccb4 (patch) | |
tree | c55f6af2338c48cb05529c6fd3aa468a1edf59ba | |
parent | 6ea8115bb6f359df4f45152f2b40e1d4d1891392 (diff) |
[WATCHDOG] blackfin Watchdog driver: relocate all strings used in __init functions to __initdata
Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r-- | 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 472be10f0686..1237113dc14a 100644 --- a/drivers/watchdog/bfin_wdt.c +++ b/drivers/watchdog/bfin_wdt.c | |||
@@ -29,6 +29,7 @@ | |||
29 | 29 | ||
30 | #define stamp(fmt, args...) pr_debug("%s:%i: " fmt "\n", __func__, __LINE__, ## args) | 30 | #define stamp(fmt, args...) pr_debug("%s:%i: " fmt "\n", __func__, __LINE__, ## args) |
31 | #define stampit() stamp("here i am") | 31 | #define stampit() stamp("here i am") |
32 | #define pr_init(fmt, args...) ({ static const __initdata char __fmt[] = fmt; printk(__fmt, ## args); }) | ||
32 | 33 | ||
33 | #define WATCHDOG_NAME "bfin-wdt" | 34 | #define WATCHDOG_NAME "bfin-wdt" |
34 | #define PFX WATCHDOG_NAME ": " | 35 | #define PFX WATCHDOG_NAME ": " |
@@ -445,19 +446,19 @@ static int __init bfin_wdt_init(void) | |||
445 | 446 | ||
446 | ret = register_reboot_notifier(&bfin_wdt_notifier); | 447 | ret = register_reboot_notifier(&bfin_wdt_notifier); |
447 | if (ret) { | 448 | if (ret) { |
448 | printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n", ret); | 449 | pr_init(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n", ret); |
449 | return ret; | 450 | return ret; |
450 | } | 451 | } |
451 | 452 | ||
452 | ret = misc_register(&bfin_wdt_miscdev); | 453 | ret = misc_register(&bfin_wdt_miscdev); |
453 | if (ret) { | 454 | if (ret) { |
454 | printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n", | 455 | pr_init(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n", |
455 | WATCHDOG_MINOR, ret); | 456 | WATCHDOG_MINOR, ret); |
456 | unregister_reboot_notifier(&bfin_wdt_notifier); | 457 | unregister_reboot_notifier(&bfin_wdt_notifier); |
457 | return ret; | 458 | return ret; |
458 | } | 459 | } |
459 | 460 | ||
460 | printk(KERN_INFO PFX "initialized: timeout=%d sec (nowayout=%d)\n", | 461 | pr_init(KERN_INFO PFX "initialized: timeout=%d sec (nowayout=%d)\n", |
461 | timeout, nowayout); | 462 | timeout, nowayout); |
462 | 463 | ||
463 | return 0; | 464 | return 0; |