diff options
author | Enrico Jorns <ejo@pengutronix.de> | 2015-10-25 22:03:31 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-11-27 08:26:40 +0100 |
commit | 446f3d07dd59f1b15b83a31fa88fba919ce4f47d (patch) | |
tree | f085fa1ee8e49c55a81f43454d1cd4f2a4d76d1f /common | |
parent | 7098d7121e98a8a9bcda726c1a35ac2d0f29de65 (diff) | |
download | barebox-446f3d07dd59f1b15b83a31fa88fba919ce4f47d.tar.gz barebox-446f3d07dd59f1b15b83a31fa88fba919ce4f47d.tar.xz |
state: disable load command
Explicitly loading environment is not required as it will be loaded if
available during device probing
Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
-rw-r--r-- | common/state.c | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/common/state.c b/common/state.c index 117a686759..fdb5564af3 100644 --- a/common/state.c +++ b/common/state.c @@ -51,7 +51,6 @@ struct state { }; struct state_backend { - int (*load)(struct state_backend *backend, struct state *state); int (*save)(struct state_backend *backend, struct state *state); const char *name; const char *of_path; @@ -1049,30 +1048,6 @@ int state_get_name(const struct state *state, char const **name) } /* - * state_load - load a state from the backing store - * - * @state The state instance to load - */ -int state_load(struct state *state) -{ - int ret; - - if (!state->backend) - return -ENOSYS; - - ret = state->backend->load(state->backend, state); - if (ret) { - dev_warn(&state->dev, "load failed\n"); - state->dirty = 1; - } else { - dev_info(&state->dev, "load successful\n"); - state->dirty = 0; - } - - return ret; -} - -/* * state_save - save a state to the backing store * * @state The state instance to save @@ -1226,7 +1201,6 @@ int state_backend_dtb_file(struct state *state, const char *of_path, const char backend_dtb = xzalloc(sizeof(*backend_dtb)); backend = &backend_dtb->backend; - backend->load = state_backend_dtb_load; backend->save = state_backend_dtb_save; backend->of_path = xstrdup(of_path); backend->path = xstrdup(path); @@ -1238,6 +1212,15 @@ int state_backend_dtb_file(struct state *state, const char *of_path, const char if (!ret && !(meminfo.flags & MTD_NO_ERASE)) backend_dtb->need_erase = true; + ret = state_backend_dtb_load(backend, state); + if (ret) { + dev_warn(&state->dev, "load failed - using defaults\n"); + } else { + dev_info(&state->dev, "load successful\n"); + state->dirty = 0; + } + + /* ignore return value of load() */ return 0; } @@ -1548,7 +1531,6 @@ int state_backend_raw_file(struct state *state, const char *of_path, backend_raw = xzalloc(sizeof(*backend_raw)); backend = &backend_raw->backend; - backend->load = state_backend_raw_load; backend->save = state_backend_raw_save; backend->of_path = xstrdup(of_path); backend->path = xstrdup(path); @@ -1583,6 +1565,15 @@ int state_backend_raw_file(struct state *state, const char *of_path, goto err; } + ret = state_backend_raw_load(backend, state); + if (ret) { + dev_warn(&state->dev, "load failed - using defaults\n"); + } else { + dev_info(&state->dev, "load successful\n"); + state->dirty = 0; + } + + /* ignore return value of load() */ return 0; err: free(backend_raw); |