From: Hauke Mehrtens Date: Sat, 12 Jan 2013 17:14:10 +0000 (+0100) Subject: watchdog: bcm47xx_wdt.c: rename wdt_time to timeout X-Git-Tag: next-20130218~46^2~3 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=250c94e87d39f331ab4475b95bea9bacafc69b51;p=karo-tx-linux.git 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 Signed-off-by: Wim Van Sebroeck --- 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: