booke/watchdog: refine and clean up the codes
Basically, this patch does the following: 1. Move the codes of parsing boot parameters from setup-common.c to driver. In this way, code reader can know directly that there are boot parameters that can change the timeout. 2. Make boot parameter 'booke_wdt_period' effective. currently, when driver is loaded, default timeout is always being used in stead of booke_wdt_period. 3. Wrap up the watchdog timeout in device struct and clean up unnecessary codes. Signed-off-by: Tang Yuantian <yuantian.tang@freescale.com> Acked-by: Scott Wood <scottwood@freescale.com> Reviewed-by: Li Yang <leoli@freescale.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:

committed by
Wim Van Sebroeck

parent
ec2e32ca66
commit
d2deebabae
@@ -718,33 +718,6 @@ static int powerpc_debugfs_init(void)
|
||||
arch_initcall(powerpc_debugfs_init);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_BOOKE_WDT
|
||||
extern u32 booke_wdt_enabled;
|
||||
extern u32 booke_wdt_period;
|
||||
|
||||
/* Checks wdt=x and wdt_period=xx command-line option */
|
||||
notrace int __init early_parse_wdt(char *p)
|
||||
{
|
||||
if (p && strncmp(p, "0", 1) != 0)
|
||||
booke_wdt_enabled = 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
early_param("wdt", early_parse_wdt);
|
||||
|
||||
int __init early_parse_wdt_period(char *p)
|
||||
{
|
||||
unsigned long ret;
|
||||
if (p) {
|
||||
if (!kstrtol(p, 0, &ret))
|
||||
booke_wdt_period = ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
early_param("wdt_period", early_parse_wdt_period);
|
||||
#endif /* CONFIG_BOOKE_WDT */
|
||||
|
||||
void ppc_printk_progress(char *s, unsigned short hex)
|
||||
{
|
||||
pr_info("%s\n", s);
|
||||
|
Reference in New Issue
Block a user