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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello.

On 25-11-2012 2:24, Hauke Mehrtens wrote:

Rename rename

   Once it enough. :-)

wdt_timeout

   'wdt_time', you mean?

to timeout to name it like the other watchdog
driver do it.

   It's not the only change you're doing.

Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
---
  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;
  	}


WBR, Sergei




[Index of Archives]     [Linux MIPS Home]     [LKML Archive]     [Linux ARM Kernel]     [Linux ARM]     [Linux]     [Git]     [Yosemite News]     [Linux SCSI]     [Linux Hams]

  Powered by Linux