From: Christian Eggers <ceggers@arri.de>
To: barebox@lists.infradead.org
Cc: Christian Eggers <ceggers@arri.de>, ceggers@gmx.de
Subject: [PATCH 1/5] state: remove param member from struct state_string
Date: Thu, 23 Jan 2020 13:20:41 +0100 [thread overview]
Message-ID: <20200123122045.25507-1-ceggers@arri.de> (raw)
After adding the parameter, the pointer isn't required anymore.
Signed-off-by: Christian Eggers <ceggers@arri.de>
---
common/state/state.h | 1 -
common/state/state_variables.c | 7 ++++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/state/state.h b/common/state/state.h
index 912d6d484..40450feff 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 6a00c8220..003542307 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;
}
--
Christian Eggers
Embedded software developer
Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918
Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477
Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2020-01-23 12:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-23 12:20 Christian Eggers [this message]
2020-01-23 12:20 ` [PATCH 2/5] mci: remove param_probe member from struct mci Christian Eggers
2020-01-23 12:20 ` [PATCH 3/5] state: remove param member from state_uint32, state_enum32, state_mac Christian Eggers
2020-01-23 12:20 ` [PATCH 4/5] globalvar: Allow NULL pointers to be returned by dev_add_param() Christian Eggers
2020-01-23 12:20 ` [PATCH 5/5] parameter: Return NULL instead of ENOSYS if CONFIG_PARAMETER is disabled Christian Eggers
2020-01-27 9:58 ` [PATCH 1/5] state: remove param member from struct state_string Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200123122045.25507-1-ceggers@arri.de \
--to=ceggers@arri.de \
--cc=barebox@lists.infradead.org \
--cc=ceggers@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox