From 4f4d6fc426a466109b7f8b20fb2fdfaad9130aa3 Mon Sep 17 00:00:00 2001 From: Christian Eggers Date: Thu, 23 Jan 2020 13:20:41 +0100 Subject: state: remove param member from struct state_string After adding the parameter, the pointer isn't required anymore. Signed-off-by: Christian Eggers Signed-off-by: Sascha Hauer --- common/state/state.h | 1 - common/state/state_variables.c | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'common') diff --git a/common/state/state.h b/common/state/state.h index 912d6d4848..40450feff0 100644 --- a/common/state/state.h +++ b/common/state/state.h @@ -191,7 +191,6 @@ struct state_mac { */ struct state_string { struct state_variable var; - struct param_d *param; char *value; const char *value_default; char raw[]; diff --git a/common/state/state_variables.c b/common/state/state_variables.c index 6a00c82203..0035423076 100644 --- a/common/state/state_variables.c +++ b/common/state/state_variables.c @@ -413,6 +413,7 @@ static struct state_variable *state_string_create(struct state *state, { struct state_string *string; uint32_t start_size[2]; + struct param_d *param; int ret; ret = of_property_read_u32_array(node, "reg", start_size, @@ -432,11 +433,11 @@ static struct state_variable *state_string_create(struct state *state, string->var.raw = &string->raw; string->var.state = state; - string->param = dev_add_param_string(&state->dev, name, + param = dev_add_param_string(&state->dev, name, state_string_set, state_string_get, &string->value, &string->var); - if (IS_ERR(string->param)) { - ret = PTR_ERR(string->param); + if (IS_ERR(param)) { + ret = PTR_ERR(param); goto out; } -- cgit v1.2.3