RE: [PATCH][v2] powerpc/watchdog: move booke watchdog param related code to setup-common.c
From: Bhushan Bharat-R65777 <hidden>
Date: 2012-07-11 11:25:03
Also in:
linux-watchdog
ACK:
-----Original Message----- From: Linuxppc-dev [mailto:linuxppc-dev- bounces+bharat.bhushan=3Dfreescale.com@lists.ozlabs.org] On Behalf Of Sha=
ohui Xie
Sent: Wednesday, July 11, 2012 3:26 PM To: linux-watchdog@vger.kernel.org; linuxppc-dev@lists.ozlabs.org Cc: Xie Shaohui-B21989 Subject: [PATCH][v2] powerpc/watchdog: move booke watchdog param related =
code to
setup-common.c =20 Currently, BOOKE watchdog code for checking "wdt" and "wdt_period" is in setup_32.c, it cannot be used in 64-bit, so move it to a common place set=
up-
quoted hunk ↗ jump to hunk
common.c, which will be shared by 32-bit and 64-bit. =20 Also, replace the simple_strtoul with kstrtol. =20 Signed-off-by: Shaohui Xie <redacted> --- changes for v2: use setup-common.c instead of prom.c =20 arch/powerpc/kernel/setup-common.c | 27 +++++++++++++++++++++++++++ arch/powerpc/kernel/setup_32.c | 24 ------------------------ 2 files changed, 27 insertions(+), 24 deletions(-) =20diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/set=
up-
quoted hunk ↗ jump to hunk
common.c index afd4f05..bdc499c 100644--- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c@@ -720,6 +720,33 @@ static int powerpc_debugfs_init(void)arch_initcall(powerpc_debugfs_init); #endif =20 +#ifdef CONFIG_BOOKE_WDT +extern u32 booke_wdt_enabled; +extern u32 booke_wdt_period; + +/* Checks wdt=3Dx and wdt_period=3Dxx command-line option */ notrace int +__init early_parse_wdt(char *p) { + if (p && strncmp(p, "0", 1) !=3D 0) + booke_wdt_enabled =3D 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 =3D 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);diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_3=
2.c
quoted hunk ↗ jump to hunk
index ec8a53f..a8f54ec 100644--- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c@@ -149,30 +149,6 @@ notrace void __init machine_init(u64 dt_ptr) ppc_md.progress("id mach(): done", 0x200); }=20 -#ifdef CONFIG_BOOKE_WDT -extern u32 booke_wdt_enabled; -extern u32 booke_wdt_period; - -/* Checks wdt=3Dx and wdt_period=3Dxx command-line option */ -notrace in=
t __init
early_parse_wdt(char *p) -{
- if (p && strncmp(p, "0", 1) !=3D 0)
- booke_wdt_enabled =3D 1;
-
- return 0;
-}
-early_param("wdt", early_parse_wdt);
-
-int __init early_parse_wdt_period (char *p) -{
- if (p)
- booke_wdt_period =3D simple_strtoul(p, NULL, 0);
-
- return 0;
-}
-early_param("wdt_period", early_parse_wdt_period);
-#endif /* CONFIG_BOOKE_WDT */
-
/* Checks "l2cr=3Dxxxx" command-line option */ int __init ppc_setup_l2c=r(char
*str) {
--
1.6.4
=20
=20
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev