Commit 62ce2543 authored by Pranith Kumar's avatar Pranith Kumar Committed by Wim Van Sebroeck

powerpc: booke_wdt: Fix build error as a module

Building booke_wdt fails when trying to build as a module as there is no
early_param() in module. Fix by using module_param() instead of early_param().
Signed-off-by: default avatarPranith Kumar <bobby.prani@gmail.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent fca8c048
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
* occur, and the final time the board will reset. * occur, and the final time the board will reset.
*/ */
u32 booke_wdt_enabled;
u32 booke_wdt_period = CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT;
#ifdef CONFIG_PPC_FSL_BOOK3E #ifdef CONFIG_PPC_FSL_BOOK3E
#define WDTP(x) ((((x)&0x3)<<30)|(((x)&0x3c)<<15)) #define WDTP(x) ((((x)&0x3)<<30)|(((x)&0x3c)<<15))
...@@ -41,27 +39,10 @@ u32 booke_wdt_period = CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT; ...@@ -41,27 +39,10 @@ u32 booke_wdt_period = CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT;
#define WDTP_MASK (TCR_WP_MASK) #define WDTP_MASK (TCR_WP_MASK)
#endif #endif
/* Checks wdt=x and wdt_period=xx command-line option */ static bool booke_wdt_enabled;
notrace int __init early_parse_wdt(char *p) module_param(booke_wdt_enabled, bool, 0);
{ static int booke_wdt_period = CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT;
if (p && strncmp(p, "0", 1) != 0) module_param(booke_wdt_period, int, 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);
#ifdef CONFIG_PPC_FSL_BOOK3E #ifdef CONFIG_PPC_FSL_BOOK3E
...@@ -259,5 +240,6 @@ static int __init booke_wdt_init(void) ...@@ -259,5 +240,6 @@ static int __init booke_wdt_init(void)
module_init(booke_wdt_init); module_init(booke_wdt_init);
module_exit(booke_wdt_exit); module_exit(booke_wdt_exit);
MODULE_ALIAS("booke_wdt");
MODULE_DESCRIPTION("PowerPC Book-E watchdog driver"); MODULE_DESCRIPTION("PowerPC Book-E watchdog driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment