Commit 7e2a1498 authored by Wim Van Sebroeck's avatar Wim Van Sebroeck

[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: default avatarHans-Christian Egtvedt <hcegtvedt@atmel.com>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
Cc: Andrew Morton <akpm@linux-foundation.org>
parent e75e6577
...@@ -56,7 +56,7 @@ struct wdt_at32ap700x { ...@@ -56,7 +56,7 @@ struct wdt_at32ap700x {
void __iomem *regs; void __iomem *regs;
spinlock_t io_lock; spinlock_t io_lock;
int timeout; int timeout;
int users; unsigned long users;
struct miscdevice miscdev; struct miscdevice miscdev;
}; };
...@@ -68,8 +68,10 @@ static char expect_release; ...@@ -68,8 +68,10 @@ static char expect_release;
*/ */
static inline void at32_wdt_stop(void) static inline void at32_wdt_stop(void)
{ {
unsigned long psel;
spin_lock(&wdt->io_lock); 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, 0x55));
wdt_writel(wdt, CTRL, psel | WDT_BF(CTRL_KEY, 0xaa)); wdt_writel(wdt, CTRL, psel | WDT_BF(CTRL_KEY, 0xaa));
spin_unlock(&wdt->io_lock); spin_unlock(&wdt->io_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment