kernel: update bcma and ssb to master-2012-12-11-2 from wireless-testing

[openwrt.git] / target / linux / brcm47xx / patches-3.6 / 542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch

diff --git a/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch b/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch
index 8d85303..dcabc1b 100644 (file)
--- a/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch
+++ b/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch
@@ -1,12 +1,15 @@
 --- a/drivers/watchdog/bcm47xx_wdt.c
 +++ b/drivers/watchdog/bcm47xx_wdt.c
-@@ -44,12 +44,13 @@ MODULE_PARM_DESC(nowayout,
-               "Watchdog cannot be stopped once started (default="
-                               __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+@@ -30,7 +30,7 @@
+ #define DRV_NAME              "bcm47xx_wdt"
  
-+
- static inline struct bcm47xx_wdt *bcm47xx_wdt_get(struct watchdog_device *wdd)
- {
+ #define WDT_DEFAULT_TIME      30      /* seconds */
+-#define WDT_MAX_TIME          255     /* seconds */
++#define WDT_SOFTTIMER_MAX     255     /* seconds */
+ 
+ static int wdt_time = WDT_DEFAULT_TIME;
+ static bool nowayout = WATCHDOG_NOWAYOUT;
+@@ -49,7 +49,7 @@ static inline struct bcm47xx_wdt *bcm47x
        return container_of(wdd, struct bcm47xx_wdt, wdd);
  }
  
@@ -15,7 +18,7 @@
  {
        struct bcm47xx_wdt *wdt = (struct bcm47xx_wdt *)data;
        u32 next_tick = min(wdt->wdd.timeout * 1000, wdt->max_timer_ms);
-@@ -62,7 +63,7 @@ static void bcm47xx_timer_tick(unsigned
+@@ -62,7 +62,7 @@ static void bcm47xx_timer_tick(unsigned
        }
  }
  
@@ -24,7 +27,7 @@
  {
        struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
  
-@@ -71,17 +72,17 @@ static int bcm47xx_wdt_keepalive(struct
+@@ -71,17 +71,17 @@ static int bcm47xx_wdt_keepalive(struct
        return 0;
  }
  
@@ -46,7 +49,7 @@
  {
        struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
  
-@@ -91,8 +92,8 @@ static int bcm47xx_wdt_stop(struct watch
+@@ -91,12 +91,12 @@ static int bcm47xx_wdt_stop(struct watch
        return 0;
  }
  
@@ -55,9 +58,15 @@
 +static int bcm47xx_wdt_soft_set_timeout(struct watchdog_device *wdd,
 +                                      unsigned int new_time)
  {
-       if (new_time < 1 || new_time > WDT_MAX_TIME) {
+-      if (new_time < 1 || new_time > WDT_MAX_TIME) {
++      if (new_time < 1 || new_time > WDT_SOFTTIMER_MAX) {
                pr_warn("timeout value must be 1<=x<=%d, using %d\n",
-@@ -122,12 +123,12 @@ static int bcm47xx_wdt_notify_sys(struct
+-                      WDT_MAX_TIME, new_time);
++                      WDT_SOFTTIMER_MAX, new_time);
+               return -EINVAL;
+       }
+ 
+@@ -122,12 +122,12 @@ static int bcm47xx_wdt_notify_sys(struct
        return NOTIFY_DONE;
  }
  
@@ -75,7 +84,7 @@
  };
  
  static int __devinit bcm47xx_wdt_probe(struct platform_device *pdev)
-@@ -138,10 +139,10 @@ static int __devinit bcm47xx_wdt_probe(s
+@@ -138,10 +138,10 @@ static int __devinit bcm47xx_wdt_probe(s
        if (!wdt)
                return -ENXIO;