Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec652b35 authored by Zhang Rui's avatar Zhang Rui Committed by Len Brown
Browse files

ACPI: fix build warnings resulting from merge window conflict 



drivers/acpi/sysfs.c:154: warning: passing argument 1 of '__check_old_set_param' from incompatible pointer type
include/linux/moduleparam.h:165: note: expected 'int (*)(const char *, struct kernel_param *)' but argument is of type 'int (*)(const char *, const struct kernel_param *)'

Introduced by commit 1c8fce27 ("ACPI:
introduce drivers/acpi/sysfs.c") interacting with commit
9bbb9e5a ("param: use ops in struct
kernel_param, rather than get and set fns directly").

Use module_param_cb instead of the obsoleted module_param_call to fix a build warning.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 899611ee

drivers/acpi/sysfs.c

+14 −6
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static const struct acpi_dlevel acpi_debug_levels[] = { 
	ACPI_DEBUG_INIT(ACPI_LV_EVENTS),

};



static int param_get_debug_layer(char *buffer, struct kernel_param *kp)

static int param_get_debug_layer(char *buffer, const struct kernel_param *kp)

{

	int result = 0;

	int i;
@@ -128,7 +128,7 @@ static int param_get_debug_layer(char *buffer, struct kernel_param *kp) 
	return result;

}



static int param_get_debug_level(char *buffer, struct kernel_param *kp)

static int param_get_debug_level(char *buffer, const struct kernel_param *kp)

{

	int result = 0;

	int i;
@@ -149,10 +149,18 @@ static int param_get_debug_level(char *buffer, struct kernel_param *kp) 
	return result;

}



module_param_call(debug_layer, param_set_uint, param_get_debug_layer,

		  &acpi_dbg_layer, 0644);

module_param_call(debug_level, param_set_uint, param_get_debug_level,

		  &acpi_dbg_level, 0644);

static struct kernel_param_ops param_ops_debug_layer = {

	.set = param_set_uint,

	.get = param_get_debug_layer,

};



static struct kernel_param_ops param_ops_debug_level = {

	.set = param_set_uint,

	.get = param_get_debug_level,

};



module_param_cb(debug_layer, &param_ops_debug_layer, &acpi_dbg_layer, 0644);

module_param_cb(debug_level, &param_ops_debug_level, &acpi_dbg_level, 0644);



static char trace_method_name[6];

module_param_string(trace_method_name, trace_method_name, 6, 0644);