ar71xx: remove support for 2.6.36

[openwrt.git] / target / linux / ar71xx / files / drivers / watchdog / ar71xx_wdt.c

diff --git a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c
index 6b5ff21..abe157c 100644 (file)
--- a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c
+++ b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c
@@ -54,19 +54,19 @@ static int wdt_timeout = WDT_TIMEOUT;
 static int boot_status;
 static int max_timeout;
 
 static int boot_status;
 static int max_timeout;
 

-static void inline ar71xx_wdt_keepalive(void)
+static inline void ar71xx_wdt_keepalive(void)

 {
        ar71xx_reset_wr(AR71XX_RESET_REG_WDOG, ar71xx_ahb_freq * wdt_timeout);
 }
 
 {
        ar71xx_reset_wr(AR71XX_RESET_REG_WDOG, ar71xx_ahb_freq * wdt_timeout);
 }
 

-static void inline ar71xx_wdt_enable(void)
+static inline void ar71xx_wdt_enable(void)

 {
        printk(KERN_DEBUG DRV_NAME ": enabling watchdog timer\n");
        ar71xx_wdt_keepalive();
        ar71xx_reset_wr(AR71XX_RESET_REG_WDOG_CTRL, WDOG_CTRL_ACTION_FCR);
 }
 
 {
        printk(KERN_DEBUG DRV_NAME ": enabling watchdog timer\n");
        ar71xx_wdt_keepalive();
        ar71xx_reset_wr(AR71XX_RESET_REG_WDOG_CTRL, WDOG_CTRL_ACTION_FCR);
 }
 

-static void inline ar71xx_wdt_disable(void)
+static inline void ar71xx_wdt_disable(void)

 {
        printk(KERN_DEBUG DRV_NAME ": disabling watchdog timer\n");
        ar71xx_reset_wr(AR71XX_RESET_REG_WDOG_CTRL, WDOG_CTRL_ACTION_NONE);
 {
        printk(KERN_DEBUG DRV_NAME ": disabling watchdog timer\n");
        ar71xx_reset_wr(AR71XX_RESET_REG_WDOG_CTRL, WDOG_CTRL_ACTION_NONE);


@@ -156,7 +156,7 @@ static long ar71xx_wdt_ioctl(struct file *file,
        case WDIOC_GETSUPPORT:
                ret = copy_to_user((struct watchdog_info *)arg,
                                   &ar71xx_wdt_info,
        case WDIOC_GETSUPPORT:
                ret = copy_to_user((struct watchdog_info *)arg,
                                   &ar71xx_wdt_info,

-                                  sizeof(&ar71xx_wdt_info)) ? -EFAULT : 0;
+                                  sizeof(ar71xx_wdt_info)) ? -EFAULT : 0;

                break;
 
        case WDIOC_GETSTATUS:
                break;
 
        case WDIOC_GETSTATUS:


@@ -215,9 +215,8 @@ static int __devinit ar71xx_wdt_probe(struct platform_device *pdev)
        max_timeout = (0xfffffffful / ar71xx_ahb_freq);
        wdt_timeout = (max_timeout < WDT_TIMEOUT) ? max_timeout : WDT_TIMEOUT;
 
        max_timeout = (0xfffffffful / ar71xx_ahb_freq);
        wdt_timeout = (max_timeout < WDT_TIMEOUT) ? max_timeout : WDT_TIMEOUT;
 

-       boot_status =
-               (ar71xx_reset_rr(AR71XX_RESET_REG_WDOG_CTRL) & WDOG_CTRL_LAST_RESET) ?
-               WDIOF_CARDRESET : 0;
+       if (ar71xx_reset_rr(AR71XX_RESET_REG_WDOG_CTRL) & WDOG_CTRL_LAST_RESET)
+               boot_status = WDIOF_CARDRESET;

 
        ret = misc_register(&ar71xx_wdt_miscdev);
        if (ret)
 
        ret = misc_register(&ar71xx_wdt_miscdev);
        if (ret)