[OSS-Tools] [PATCH dt-utils 05/14] state: remove param member from struct state_string

[Marco Felsch]

This ports the following barebox commit

| commit 4f4d6fc426a466109b7f8b20fb2fdfaad9130aa3
| Author: Christian Eggers <cegg...@arri.de>
| Date:   Thu Jan 23 13:20:41 2020 +0100
|
|     state: remove param member from struct state_string
|
|     After adding the parameter, the pointer isn't required anymore.
|
|     Signed-off-by: Christian Eggers <cegg...@arri.de>
|     Signed-off-by: Sascha Hauer <s.ha...@pengutronix.de>

Signed-off-by: Marco Felsch <m.fel...@pengutronix.de>
---
 src/barebox-state/state.h           | 1 -
 src/barebox-state/state_variables.c | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/barebox-state/state.h b/src/barebox-state/state.h
index 912d6d4..40450fe 100644
--- a/src/barebox-state/state.h
+++ b/src/barebox-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/src/barebox-state/state_variables.c 
b/src/barebox-state/state_variables.c
index 16f630f..18d9884 100644
--- a/src/barebox-state/state_variables.c
+++ b/src/barebox-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;
        }
 
-- 
2.30.2