Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7e2a1498a90aff0e57271bf838a29aaa4e1c6bf9
Commit:     7e2a1498a90aff0e57271bf838a29aaa4e1c6bf9
Parent:     e75e657756554676f13070266bedbd75d404a0f8
Author:     Wim Van Sebroeck <[EMAIL PROTECTED]>
AuthorDate: Tue Jul 3 17:59:29 2007 +0000
Committer:  Wim Van Sebroeck <[EMAIL PROTECTED]>
CommitDate: Thu Jul 5 05:37:44 2007 +0000

    [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 <[EMAIL PROTECTED]>
    Cc: Haavard Skinnemoen <[EMAIL PROTECTED]>
    Signed-off-by: Wim Van Sebroeck <[EMAIL PROTECTED]>
    Cc: Andrew Morton <[EMAIL PROTECTED]>
---
 drivers/char/watchdog/at32ap700x_wdt.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/char/watchdog/at32ap700x_wdt.c 
b/drivers/char/watchdog/at32ap700x_wdt.c
index 75e852e..54a5161 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to