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

Commit 4ef2db01 authored by Rusty Russell's avatar Rusty Russell
Browse files

param: update drivers/acpi/debug.c to new scheme 



The new module_param_cb() uses an ops struct, and the ops take a
const struct kernel_param pointer (it's in .rodata).

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 57ba4717

drivers/acpi/debug.c

+24 −8
Original line number Original line Diff line number Diff line
@@ -96,7 +96,8 @@ static const struct acpi_dlevel acpi_debug_levels[] = { 
/* --------------------------------------------------------------------------

/* --------------------------------------------------------------------------

                              FS Interface (/sys)

                              FS Interface (/sys)

   -------------------------------------------------------------------------- */

   -------------------------------------------------------------------------- */

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 result = 0;

	int i;

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

	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 result = 0;

	int i;

	int i;
@@ -137,8 +139,18 @@ static int param_get_debug_level(char *buffer, struct kernel_param *kp) { 
	return result;

	return result;

}

}





module_param_call(debug_layer, param_set_uint, param_get_debug_layer, &acpi_dbg_layer, 0644);

static struct kernel_param_ops acpi_debug_layer_ops = {

module_param_call(debug_level, param_set_uint, param_get_debug_level, &acpi_dbg_level, 0644);

	.set = param_set_uint,

	.get = param_get_debug_layer,

};



static struct kernel_param_ops acpi_debug_level_ops = {

	.set = param_set_uint,

	.get = param_get_debug_level,

};



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

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





static char trace_method_name[6];

static char trace_method_name[6];

module_param_string(trace_method_name, trace_method_name, 6, 0644);

module_param_string(trace_method_name, trace_method_name, 6, 0644);
@@ -147,7 +159,7 @@ module_param(trace_debug_layer, uint, 0644); 
static unsigned int trace_debug_level;

static unsigned int trace_debug_level;

module_param(trace_debug_level, uint, 0644);

module_param(trace_debug_level, uint, 0644);





static int param_set_trace_state(const char *val, struct kernel_param *kp)

static int param_set_trace_state(const char *val, const struct kernel_param *kp)

{

{

	int result = 0;

	int result = 0;
@@ -181,7 +193,7 @@ exit: 
	return result;

	return result;

}

}





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

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

{

{

	if (!acpi_gbl_trace_method_name)

	if (!acpi_gbl_trace_method_name)

		return sprintf(buffer, "disable");

		return sprintf(buffer, "disable");
@@ -194,8 +206,12 @@ static int param_get_trace_state(char *buffer, struct kernel_param *kp) 
	return 0;

	return 0;

}

}





module_param_call(trace_state, param_set_trace_state, param_get_trace_state,

static struct kernel_param_ops param_ops_trace_state = {

		  NULL, 0644);

	.set = param_set_trace_state,

	.get = param_get_trace_state,

};



module_param_cb(trace_state, &param_ops_trace_state, NULL, 0644);





/* --------------------------------------------------------------------------

/* --------------------------------------------------------------------------

				DebugFS Interface

				DebugFS Interface