From 58cf41984a3791e7a516641f107ff70bd844ef72 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Fri, 8 Aug 2008 18:39:11 +0300 Subject: [WATCHDOG] fix watchdog/shwdt.c compilation This patch fixes the following compile errors caused by commit 70b814ec1a484279a51bf9f7193551b996627247 ([WATCHDOG 45/57] shwdt: coding style, cleanup, switch to unlocked_io): <-- snip --> ... CC drivers/watchdog/shwdt.o shwdt.c:64: error: 'WTCSR_CKS_4096' undeclared here (not in a function) shwdt.c: In function 'sh_wdt_start': shwdt.c:92: error: 'wdt_lock' undeclared (first use in this function) shwdt.c:92: error: (Each undeclared identifier is reported only once shwdt.c:92: error: for each function it appears in.) shwdt.c:97: error: implicit declaration of function 'sh_wdt_read_csr' shwdt.c:98: error: 'WTCSR_WT' undeclared (first use in this function) shwdt.c:99: error: implicit declaration of function 'sh_wdt_write_csr' shwdt.c:101: error: implicit declaration of function 'sh_wdt_write_cnt' shwdt.c:112: error: 'WTCSR_TME' undeclared (first use in this function) shwdt.c:113: error: 'WTCSR_RSTS' undeclared (first use in this function) shwdt.c: In function 'sh_wdt_stop': shwdt.c:142: error: 'wdt_lock' undeclared (first use in this function) shwdt.c:147: error: 'WTCSR_TME' undeclared (first use in this function) shwdt.c: In function 'sh_wdt_keepalive': shwdt.c:160: error: 'wdt_lock' undeclared (first use in this function) shwdt.c: In function 'sh_wdt_set_heartbeat': shwdt.c:176: error: 'wdt_lock' undeclared (first use in this function) shwdt.c: In function 'sh_wdt_ping': shwdt.c:192: error: 'wdt_lock' undeclared (first use in this function) shwdt.c:197: error: 'WTCSR_IOVF' undeclared (first use in this function) shwdt.c: At top level: shwdt.c:417: error: conflicting type qualifiers for 'sh_wdt_info' shwdt.c:71: error: previous declaration of 'sh_wdt_info' was here make[3]: *** [drivers/watchdog/shwdt.o] Error 1 <-- snip --> Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Wim Van Sebroeck --- drivers/watchdog/shwdt.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'drivers/watchdog') diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c index 824125adf90a..cdc7138be301 100644 --- a/drivers/watchdog/shwdt.c +++ b/drivers/watchdog/shwdt.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #define PFX "shwdt: " @@ -68,7 +68,7 @@ static int clock_division_ratio = WTCSR_CKS_4096; static void sh_wdt_ping(unsigned long data); static unsigned long shwdt_is_open; -static struct watchdog_info sh_wdt_info; +static const struct watchdog_info sh_wdt_info; static char shwdt_expect_close; static DEFINE_TIMER(timer, sh_wdt_ping, 0, 0); static unsigned long next_heartbeat; @@ -89,7 +89,7 @@ static void sh_wdt_start(void) __u8 csr; unsigned long flags; - spin_lock_irqsave(&wdt_lock, flags); + spin_lock_irqsave(&shwdt_lock, flags); next_heartbeat = jiffies + (heartbeat * HZ); mod_timer(&timer, next_ping_period(clock_division_ratio)); @@ -127,7 +127,7 @@ static void sh_wdt_start(void) csr &= ~RSTCSR_RSTS; sh_wdt_write_rstcsr(csr); #endif - spin_unlock_irqrestore(&wdt_lock, flags); + spin_unlock_irqrestore(&shwdt_lock, flags); } /** @@ -139,14 +139,14 @@ static void sh_wdt_stop(void) __u8 csr; unsigned long flags; - spin_lock_irqsave(&wdt_lock, flags); + spin_lock_irqsave(&shwdt_lock, flags); del_timer(&timer); csr = sh_wdt_read_csr(); csr &= ~WTCSR_TME; sh_wdt_write_csr(csr); - spin_unlock_irqrestore(&wdt_lock, flags); + spin_unlock_irqrestore(&shwdt_lock, flags); } /** @@ -157,9 +157,9 @@ static inline void sh_wdt_keepalive(void) { unsigned long flags; - spin_lock_irqsave(&wdt_lock, flags); + spin_lock_irqsave(&shwdt_lock, flags); next_heartbeat = jiffies + (heartbeat * HZ); - spin_unlock_irqrestore(&wdt_lock, flags); + spin_unlock_irqrestore(&shwdt_lock, flags); } /** @@ -173,9 +173,9 @@ static int sh_wdt_set_heartbeat(int t) if (unlikely(t < 1 || t > 3600)) /* arbitrary upper limit */ return -EINVAL; - spin_lock_irqsave(&wdt_lock, flags); + spin_lock_irqsave(&shwdt_lock, flags); heartbeat = t; - spin_unlock_irqrestore(&wdt_lock, flags); + spin_unlock_irqrestore(&shwdt_lock, flags); return 0; } @@ -189,7 +189,7 @@ static void sh_wdt_ping(unsigned long data) { unsigned long flags; - spin_lock_irqsave(&wdt_lock, flags); + spin_lock_irqsave(&shwdt_lock, flags); if (time_before(jiffies, next_heartbeat)) { __u8 csr; @@ -203,7 +203,7 @@ static void sh_wdt_ping(unsigned long data) } else printk(KERN_WARNING PFX "Heartbeat lost! Will not ping " "the watchdog\n"); - spin_unlock_irqrestore(&wdt_lock, flags); + spin_unlock_irqrestore(&shwdt_lock, flags); } /** -- cgit v1.2.2