Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3908bb18 authored Sep 11, 2005 by Wim Van Sebroeck

[WATCHDOG] sbc8360+w83977f_wdt-consolidate_CONFIG_WATCHDOG_NOWAYOUT_handling



Attached patch removes #ifdef CONFIG_WATCHDOG_NOWAYOUT mess and
replaces it with common define in linux/watchdog.h.

Signed-Off-By: Wim Van Sebroeck <wim@iguana.be>

parent b4cc4aa2

drivers/char/watchdog/sbc8360.c

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -199,12 +199,7 @@ static int wd_times[64][2] = {
	static int timeout = 27;		static int timeout = 27;
	static int wd_margin = 0xB;		static int wd_margin = 0xB;
	static int wd_multiplier = 2;		static int wd_multiplier = 2;
			static int nowayout = WATCHDOG_NOWAYOUT;
	#ifdef CONFIG_WATCHDOG_NOWAYOUT
	static int nowayout = 1;
	#else
	static int nowayout = 0;
	#endif

	module_param(timeout, int, 27);		module_param(timeout, int, 27);
	MODULE_PARM_DESC(timeout, "Index into timeout table (0-63) (default=27 (60s))");		MODULE_PARM_DESC(timeout, "Index into timeout table (0-63) (default=27 (60s))");

drivers/char/watchdog/w83977f_wdt.c

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -58,12 +58,7 @@ MODULE_PARM_DESC(timeout,"Watchdog timeout in seconds (15..7635), default=" __MO
	module_param(testmode, int, 0);		module_param(testmode, int, 0);
	MODULE_PARM_DESC(testmode,"Watchdog testmode (1 = no reboot), default=0");		MODULE_PARM_DESC(testmode,"Watchdog testmode (1 = no reboot), default=0");

	#ifdef CONFIG_WATCHDOG_NOWAYOUT		static int nowayout = WATCHDOG_NOWAYOUT;
	static int nowayout = 1;
	#else
	static int nowayout = 0;
	#endif

	module_param(nowayout, int, 0);		module_param(nowayout, int, 0);
	MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");		MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");