powerpc: booke_wdt: Fix build error as a module
PATCH v2 1/1 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().
--- drivers/watchdog/booke_wdt.c | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-)
drivers/watchdog/booke_wdt.c +5 -23
@@ -30,8 +30,6 @@* 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 #define WDTP (x) ((((x)&0x3)<<30)|(((x)&0x3c)<<15))
@@ -41,27 +39,10 @@ u32 booke_wdt_period = CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT;#define WDTP_MASK (TCR_WP_MASK)#endif -/* 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); +static bool booke_wdt_enabled; +module_param (booke_wdt_enabled, bool,0 ); +static int booke_wdt_period =CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT ; +module_param (booke_wdt_period, int,0 );#ifdef CONFIG_PPC_FSL_BOOK3E
@@ -259,5 +240,6 @@ static int __init booke_wdt_init(void)module_init (booke_wdt_init);module_exit (booke_wdt_exit); +MODULE_ALIAS ("booke_wdt" );MODULE_DESCRIPTION ("PowerPC Book-E watchdog driver" );MODULE_LICENSE ("GPL" );
Signature · 1 line
1.9.1
Guenter Roeck
maintainerQuoted 5 lines · Pranith Kumar
Building
booke_wdtfails when trying to build as a module as there is noearly_param()in module. Fix by usingmodule_param()instead ofearly_param().Signed-off-by Pranith Kumar <[email protected]>CC Guenter Roeck <[email protected]>
Looks good as far as I can see. One question though:
Quoted 1 line
+MODULE_ALIAS("booke_wdt");
Is this necessary ? If yes, shouldn't it be a separate patch to be applied to -stable ?
Thanks,
Guenter
Quoted 7 lines · Guenter Roeck
Quoted 5 lines · Pranith Kumar
Building
booke_wdtfails when trying to build as a module as there is noearly_param()in module. Fix by usingmodule_param()instead ofearly_param().Signed-off-by Pranith Kumar <[email protected]>CC Guenter Roeck <[email protected]>
Quoted 6 lines
Looks good as far as I can see. One question though:
Quoted 1 line
+MODULE_ALIAS("booke_wdt");
Is this necessary ? If yes, shouldn't it be a separate patch to be applied to -stable ?
Suppose this was actually built as a module. How do you pass the module parameters to this module? Only ways I know of are
./insmod booke_wdt booke_wdt_enabled=1 booke_wdt_period=3
or pass booke_wdt.booke_wdt_enabled=1 on the kernel boot params list.
So the alias is necessary to refer to this module to pass params.
About separate patch, I think it is only with conversion to module_param() that we need this alias.
Am I missing something?
Signature · 1 line
Pranith
Quoted 5 lines · Pranith Kumar
Building
booke_wdtfails when trying to build as a module as there is noearly_param()in module. Fix by usingmodule_param()instead ofearly_param().Signed-off-by Pranith Kumar <[email protected]>CC Guenter Roeck <[email protected]>