linux-mips
[Top] [All Lists]

[PATCH 04/15] watchdog: bcm47xx_wdt.c: rename wdt_timeout to timeout

To: linville@tuxdriver.com
Subject: [PATCH 04/15] watchdog: bcm47xx_wdt.c: rename wdt_timeout to timeout
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 24 Nov 2012 23:24:04 +0100
Cc: linux-wireless@vger.kernel.org, wim@iguana.be, linux-watchdog@vger.kernel.org, castet.matthieu@free.fr, biblbroks@sezampro.rs, m@bues.ch, zajec5@gmail.com, linux-mips@linux-mips.org, Hauke Mehrtens <hauke@hauke-m.de>
In-reply-to: <1353795855-22236-1-git-send-email-hauke@hauke-m.de>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
References: <1353795855-22236-1-git-send-email-hauke@hauke-m.de>
Sender: linux-mips-bounce@linux-mips.org
Rename rename wdt_timeout to timeout to name it like the other watchdog
driver do it.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 drivers/watchdog/bcm47xx_wdt.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c
index 66f2d2b..b6a8c49 100644
--- a/drivers/watchdog/bcm47xx_wdt.c
+++ b/drivers/watchdog/bcm47xx_wdt.c
@@ -30,13 +30,13 @@
 #define DRV_NAME               "bcm47xx_wdt"
 
 #define WDT_DEFAULT_TIME       30      /* seconds */
-#define WDT_MAX_TIME           255     /* seconds */
+#define WDT_SOFTTIMER_MAX      3600    /* seconds */
 
-static int wdt_time = WDT_DEFAULT_TIME;
+static int timeout = WDT_DEFAULT_TIME;
 static bool nowayout = WATCHDOG_NOWAYOUT;
 
-module_param(wdt_time, int, 0);
-MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default="
+module_param(timeout, int, 0);
+MODULE_PARM_DESC(timeout, "Watchdog time in seconds. (default="
                                __MODULE_STRING(WDT_DEFAULT_TIME) ")");
 
 module_param(nowayout, bool, 0);
@@ -94,9 +94,9 @@ static int bcm47xx_wdt_soft_stop(struct watchdog_device *wdd)
 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_SOFTTIMER_MAX) {
                pr_warn("timeout value must be 1<=x<=%d, using %d\n",
-                       WDT_MAX_TIME, new_time);
+                       WDT_SOFTTIMER_MAX, new_time);
                return -EINVAL;
        }
 
@@ -160,7 +160,7 @@ static int __devinit bcm47xx_wdt_probe(struct 
platform_device *pdev)
                goto err_notifier;
 
        pr_info("BCM47xx Watchdog Timer enabled (%d seconds%s)\n",
-               wdt_time, nowayout ? ", nowayout" : "");
+               timeout, nowayout ? ", nowayout" : "");
        return 0;
 
 err_notifier:
-- 
1.7.10.4


<Prev in Thread] Current Thread [Next in Thread>