diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-07-15 11:56:52 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-07-22 12:05:39 +0200 |
commit | b9ac9a9785071f5d243cf287c527286624c08f1b (patch) | |
tree | 6a172e4cea2587ab0eee8facb371945acfbce50a | |
parent | 2ccd60013dc2dabdb91cd2964cd9ce15eb949b1b (diff) | |
download | barebox-b9ac9a9785071f5d243cf287c527286624c08f1b.tar.gz barebox-b9ac9a9785071f5d243cf287c527286624c08f1b.tar.xz |
nv: Do not save nv variables while loading
When reading nv variables from the storage in /env/nv we do
not need to write back the value to the file we just read from.
Optimize this a bit and make it unnecessary.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | common/globalvar.c | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/common/globalvar.c b/common/globalvar.c index c0958e11ea..be082314e7 100644 --- a/common/globalvar.c +++ b/common/globalvar.c @@ -180,15 +180,26 @@ static int nv_set(struct device_d *dev, struct param_d *p, const char *val) free(p->value); p->value = xstrdup(val); - return nv_save(p->name, val); + return 0; } -static const char *nv_get(struct device_d *dev, struct param_d *p) +static const char *nv_param_get(struct device_d *dev, struct param_d *p) { return p->value ? p->value : ""; } -int nvvar_add(const char *name, const char *value) +static int nv_param_set(struct device_d *dev, struct param_d *p, const char *val) +{ + int ret; + + ret = nv_set(dev, p, val); + if (ret) + return ret; + + return nv_save(p->name, val); +} + +static int __nvvar_add(const char *name, const char *value) { struct param_d *p, *gp; int ret; @@ -226,7 +237,7 @@ int nvvar_add(const char *name, const char *value) return ret; } - p = dev_add_param(&nv_device, name, nv_set, nv_get, 0); + p = dev_add_param(&nv_device, name, nv_param_set, nv_param_get, 0); if (IS_ERR(p)) return PTR_ERR(p); @@ -242,6 +253,17 @@ int nvvar_add(const char *name, const char *value) return nv_set(&nv_device, p, value); } +int nvvar_add(const char *name, const char *value) +{ + int ret; + + ret = __nvvar_add(name, value); + if (ret) + return ret; + + return nv_save(name, value); +} + int nvvar_remove(const char *name) { struct param_d *p; @@ -288,7 +310,7 @@ int nvvar_load(void) pr_debug("%s: Setting \"%s\" to \"%s\"\n", __func__, d->d_name, val); - ret = nvvar_add(d->d_name, val); + ret = __nvvar_add(d->d_name, val); if (ret) pr_err("failed to create nv variable %s: %s\n", d->d_name, strerror(-ret)); |