summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-01-12 18:14:10 +0100
committerWim Van Sebroeck <wim@iguana.be>2013-03-01 12:47:28 +0100
commit93aed1f02a7a67ce81e6bd2e37c3e1d994d33d5b (patch)
tree7d5d34ed34537e5023364efb484f9f5e085b17cb /drivers/watchdog
parenta39068929a9a7c418c569c6d22990953b4f75df7 (diff)
downloadblackbird-op-linux-93aed1f02a7a67ce81e6bd2e37c3e1d994d33d5b.tar.gz
blackbird-op-linux-93aed1f02a7a67ce81e6bd2e37c3e1d994d33d5b.zip
watchdog: bcm47xx_wdt.c: rename wdt_time to timeout
Rename wdt_time to timeout to name it like the other watchdog driver do it. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/bcm47xx_wdt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c
index 5a13e43784d3..e3bfe25a71ef 100644
--- a/drivers/watchdog/bcm47xx_wdt.c
+++ b/drivers/watchdog/bcm47xx_wdt.c
@@ -32,11 +32,11 @@
#define WDT_DEFAULT_TIME 30 /* seconds */
#define WDT_SOFTTIMER_MAX 255 /* 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);
@@ -160,7 +160,7 @@ static int 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:
OpenPOWER on IntegriCloud