From: Wim Van Sebroeck <wim@iguana.be>
Date: Tue, 3 Jul 2007 17:59:29 +0000 (+0000)
Subject: [WATCHDOG] at32ap700x_wdt.c - Fix compilation warnings
X-Git-Url: https://git.karo-electronics.de/?p=mv-sheeva.git;a=commitdiff_plain;h=7e2a1498a90aff0e57271bf838a29aaa4e1c6bf9

[WATCHDOG] at32ap700x_wdt.c - Fix compilation warnings

Fix warning:
* ISO C90 forbids mixed declarations and code
* passing argument 2 of ‘test_and_set_bit’ from incompatible pointer type
* passing argument 2 of ‘clear_bit’ from incompatible pointer type

Signed-off-by: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Cc: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/drivers/char/watchdog/at32ap700x_wdt.c b/drivers/char/watchdog/at32ap700x_wdt.c
index 75e852e954e..54a516169d0 100644
--- a/drivers/char/watchdog/at32ap700x_wdt.c
+++ b/drivers/char/watchdog/at32ap700x_wdt.c
@@ -56,7 +56,7 @@ struct wdt_at32ap700x {
 	void __iomem		*regs;
 	spinlock_t		io_lock;
 	int			timeout;
-	int			users;
+	unsigned long		users;
 	struct miscdevice	miscdev;
 };
 
@@ -68,8 +68,10 @@ static char expect_release;
  */
 static inline void at32_wdt_stop(void)
 {
+	unsigned long psel;
+
 	spin_lock(&wdt->io_lock);
-	unsigned long psel = wdt_readl(wdt, CTRL) & WDT_BF(CTRL_PSEL, 0x0f);
+	psel = wdt_readl(wdt, CTRL) & WDT_BF(CTRL_PSEL, 0x0f);
 	wdt_writel(wdt, CTRL, psel | WDT_BF(CTRL_KEY, 0x55));
 	wdt_writel(wdt, CTRL, psel | WDT_BF(CTRL_KEY, 0xaa));
 	spin_unlock(&wdt->io_lock);