From: Rusty R. <ru...@ru...> - 2004-11-29 00:39:13
|
On Mon, 2004-11-08 at 18:31 -0800, Borislav Deianov wrote: > On Mon, Nov 08, 2004 at 06:12:24PM -0800, Chris Wright wrote: > > > > Ah, even better. Thanks Boris. BTW, you could probably mark ibm_init() > > and ibm_handle_init() as __init. > > Good point, I'll do it in the next version. You cannot use module_param the way you are trying to: it must be used at the top level, and it will be called before your module's init function. This patch might serve as a starting point... Rusty. Name: Fix Parameter Handling in ibm_acpi.c Status: Untested Signed-off-by: Rusty Russell <ru...@ru...> You can't call module_param et al inside a function. It doesn't make sense, and it doesn't work. Index: linux-2.6.10-rc2-bk11-Module/drivers/acpi/ibm_acpi.c =================================================================== --- linux-2.6.10-rc2-bk11-Module.orig/drivers/acpi/ibm_acpi.c 2004-11-29 11:30:51.723729720 +1100 +++ linux-2.6.10-rc2-bk11-Module/drivers/acpi/ibm_acpi.c 2004-11-29 11:31:08.757140248 +1100 @@ -1147,21 +1147,26 @@ object##_paths, sizeof(object##_paths)/sizeof(char*), required) -static void ibm_param(char *feature, char *cmd) +static int set_ibm_param(const char *val, struct kernel_param *kp) { - int i; + unsigned int i; + char arg_with_comma[32]; + + if (strlen(val) > 30) + return -ENOSPC; + + strcpy(arg_with_comma, val); + strcat(arg_with_comma, ","); - strcat(cmd, ","); for (i=0; i<NUM_IBMS; i++) - if (strcmp(ibms[i].name, feature) == 0) - ibms[i].write(&ibms[i], cmd); -} - -#define IBM_PARAM(feature) do { \ - static char cmd[32]; \ - module_param_string(feature, cmd, sizeof(cmd) - 1, 0); \ - ibm_param(#feature, cmd); \ -} while (0) + if (strcmp(ibms[i].name, kp->name) == 0) + return ibms[i].write(&ibms[i], arg_with_comma); + BUG(); + return -EINVAL; +} + +#define IBM_PARAM(feature) \ + module_param_call(feature, set_ibm_param, NULL, NULL, 0) static void __exit acpi_ibm_exit(void) { @@ -1216,16 +1221,6 @@ } } - IBM_PARAM(hotkey); - IBM_PARAM(bluetooth); - IBM_PARAM(video); - IBM_PARAM(light); - IBM_PARAM(dock); - IBM_PARAM(bay); - IBM_PARAM(cmos); - IBM_PARAM(led); - IBM_PARAM(beep); - return 0; } @@ -1235,3 +1230,13 @@ MODULE_AUTHOR("Borislav Deianov"); MODULE_DESCRIPTION(IBM_DESC); MODULE_LICENSE("GPL"); + +IBM_PARAM(hotkey); +IBM_PARAM(bluetooth); +IBM_PARAM(video); +IBM_PARAM(light); +IBM_PARAM(dock); +IBM_PARAM(bay); +IBM_PARAM(cmos); +IBM_PARAM(led); +IBM_PARAM(beep); -- A bad analogy is like a leaky screwdriver -- Richard Braakman |