target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_timeout-to-timeout.patch

   1 --- a/drivers/watchdog/bcm47xx_wdt.c
   2 +++ b/drivers/watchdog/bcm47xx_wdt.c
   3 @@ -30,13 +30,13 @@
   4  #define DRV_NAME               "bcm47xx_wdt"
   5
   6  #define WDT_DEFAULT_TIME       30      /* seconds */
   7 -#define WDT_MAX_TIME           255     /* seconds */
   8 +#define WDT_SOFTTIMER_MAX      3600    /* seconds */
   9
  10 -static int wdt_time = WDT_DEFAULT_TIME;
  11 +static int timeout = WDT_DEFAULT_TIME;
  12  static bool nowayout = WATCHDOG_NOWAYOUT;
  13
  14 -module_param(wdt_time, int, 0);
  15 -MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default="
  16 +module_param(timeout, int, 0);
  17 +MODULE_PARM_DESC(timeout, "Watchdog time in seconds. (default="
  18                                 __MODULE_STRING(WDT_DEFAULT_TIME) ")");
  19
  20  module_param(nowayout, bool, 0);
  21 @@ -95,9 +95,9 @@ static int bcm47xx_wdt_soft_stop(struct
  22  static int bcm47xx_wdt_soft_set_timeout(struct watchdog_device *wdd,
  23                                         unsigned int new_time)
  24  {
  25 -       if (new_time < 1 || new_time > WDT_MAX_TIME) {
  26 +       if (new_time < 1 || new_time > WDT_SOFTTIMER_MAX) {
  27                 pr_warn("timeout value must be 1<=x<=%d, using %d\n",
  28 -                       WDT_MAX_TIME, new_time);
  29 +                       WDT_SOFTTIMER_MAX, new_time);
  30                 return -EINVAL;
  31         }
  32
  33 @@ -161,7 +161,7 @@ static int __devinit bcm47xx_wdt_probe(s
  34                 goto err_notifier;
  35
  36         pr_info("BCM47xx Watchdog Timer enabled (%d seconds%s)\n",
  37 -               wdt_time, nowayout ? ", nowayout" : "");
  38 +               timeout, nowayout ? ", nowayout" : "");
  39         return 0;
  40
  41  err_notifier: