[OSS-Tools] [PATCH dt-utils 06/14] state: remove param member from state_uint32, state_enum32, state_mac

[Marco Felsch]

This ports the following barebox commit

| commit 8718fd1f0508ed694569df212333fff9a22b5303
| Author: Christian Eggers <cegg...@arri.de>
| Date:   Thu Jan 23 13:20:43 2020 +0100
|
|     state: remove param member from state_uint32, state_enum32, state_mac
|
|     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           |  3 ---
 src/barebox-state/state_variables.c | 16 ++++++++--------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/barebox-state/state.h b/src/barebox-state/state.h
index 40450fe..1881d92 100644
--- a/src/barebox-state/state.h
+++ b/src/barebox-state/state.h
@@ -159,7 +159,6 @@ struct state_variable {
  */
 struct state_uint32 {
        struct state_variable var;
-       struct param_d *param;
        uint32_t value;
        uint32_t value_default;
 };
@@ -169,7 +168,6 @@ struct state_uint32 {
  */
 struct state_enum32 {
        struct state_variable var;
-       struct param_d *param;
        uint32_t value;
        uint32_t value_default;
        const char **names;
@@ -181,7 +179,6 @@ struct state_enum32 {
  */
 struct state_mac {
        struct state_variable var;
-       struct param_d *param;
        uint8_t value[6];
        uint8_t value_default[6];
 };
diff --git a/src/barebox-state/state_variables.c 
b/src/barebox-state/state_variables.c
index 18d9884..228a822 100644
--- a/src/barebox-state/state_variables.c
+++ b/src/barebox-state/state_variables.c
@@ -116,7 +116,6 @@ static struct state_variable *state_uint8_create(struct 
state *state,
                return ERR_CAST(param);
        }
 
-       su32->param = param;
        su32->var.type = vtype;
        su32->var.size = sizeof(uint8_t);
 #ifdef __LITTLE_ENDIAN
@@ -146,7 +145,6 @@ static struct state_variable *state_uint32_create(struct 
state *state,
                return ERR_CAST(param);
        }
 
-       su32->param = param;
        su32->var.type = vtype;
        su32->var.size = sizeof(uint32_t);
        su32->var.raw = &su32->value;
@@ -226,6 +224,7 @@ static struct state_variable *state_enum32_create(struct 
state *state,
                                                  const struct variable_type 
*vtype)
 {
        struct state_enum32 *enum32;
+       struct param_d *param;
        int ret, i, num_names;
 
        enum32 = xzalloc(sizeof(*enum32));
@@ -253,11 +252,11 @@ static struct state_variable *state_enum32_create(struct 
state *state,
                enum32->names[i] = xstrdup(name);
        }
 
-       enum32->param = dev_add_param_enum(&state->dev, name, state_set_dirty,
+       param = dev_add_param_enum(&state->dev, name, state_set_dirty,
                                           NULL, &enum32->value, enum32->names,
                                           num_names, &enum32->var);
-       if (IS_ERR(enum32->param)) {
-               ret = PTR_ERR(enum32->param);
+       if (IS_ERR(param)) {
+               ret = PTR_ERR(param);
                goto out;
        }
 
@@ -310,6 +309,7 @@ static struct state_variable *state_mac_create(struct state 
*state,
                                               const struct variable_type 
*vtype)
 {
        struct state_mac *mac;
+       struct param_d *param;
        int ret;
 
        mac = xzalloc(sizeof(*mac));
@@ -319,10 +319,10 @@ static struct state_variable *state_mac_create(struct 
state *state,
        mac->var.raw = mac->value;
        mac->var.state = state;
 
-       mac->param = dev_add_param_mac(&state->dev, name, state_set_dirty,
+       param = dev_add_param_mac(&state->dev, name, state_set_dirty,
                                       NULL, mac->value, &mac->var);
-       if (IS_ERR(mac->param)) {
-               ret = PTR_ERR(mac->param);
+       if (IS_ERR(param)) {
+               ret = PTR_ERR(param);
                goto out;
        }
 
-- 
2.30.2