summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-06-13 16:05:16 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2017-06-13 16:05:16 +0200
commit2e90db44644fd775cad67ddcd480642316b5bc2b (patch)
tree99cb3d0b0f3f2451a308d50d58c99df2ed455a96
parent4126f15002a874a7b860b2f2a1ef45c1a63308d1 (diff)
downloadbarebox-2e90db44644fd775cad67ddcd480642316b5bc2b.tar.gz
Revert "nv: Do not create globalvars from nvvars"
This reverts commit 35d8e858bea17ec4796069c9c27fd0b134125eaf.
-rw-r--r--common/globalvar.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/common/globalvar.c b/common/globalvar.c
index 1b3082a..fdfaf76 100644
--- a/common/globalvar.c
+++ b/common/globalvar.c
@@ -165,18 +165,14 @@ static int nvvar_device_dispatch(const char *name, struct device_d **dev,
static int nv_set(struct device_d *dev, struct param_d *p, const char *val)
{
- struct param_d *g;
int ret;
if (!val)
val = "";
- g = get_param_by_name(&global_device, p->name);
- if (g) {
- ret = dev_set_param(&global_device, p->name, val);
- if (ret)
- return ret;
- }
+ ret = dev_set_param(&global_device, p->name, val);
+ if (ret)
+ return ret;
free(p->value);
p->value = xstrdup(val);
@@ -203,6 +199,7 @@ static int nv_param_set(struct device_d *dev, struct param_d *p, const char *val
static int __nvvar_add(const char *name, const char *value)
{
struct param_d *p;
+ int ret;
if (!IS_ENABLED(CONFIG_NVVAR))
return -ENOSYS;
@@ -215,6 +212,11 @@ static int __nvvar_add(const char *name, const char *value)
return PTR_ERR(p);
}
+ /* Create corresponding globalvar if it doesn't exist yet */
+ ret = globalvar_add_simple(name, value);
+ if (ret && ret != -EEXIST)
+ return ret;
+
if (value)
return nv_set(&nv_device, p, value);
@@ -391,15 +393,6 @@ static int globalvar_simple_set(struct device_d *dev, struct param_d *p, const c
return dev_param_set_generic(dev, p, val);
}
-static void globalvar_nv_sync(const char *name)
-{
- const char *val;
-
- val = dev_get_param(&nv_device, name);
- if (val)
- dev_set_param(&global_device, name, val);
-}
-
/*
* globalvar_add_simple
*
@@ -416,12 +409,10 @@ int globalvar_add_simple(const char *name, const char *value)
return PTR_ERR(param);
}
- if (value)
- dev_set_param(&global_device, name, value);
-
- globalvar_nv_sync(name);
+ if (!value)
+ return 0;
- return 0;
+ return dev_set_param(&global_device, name, value);
}
static int globalvar_remove_unqualified(const char *name)
@@ -440,6 +431,15 @@ static int globalvar_remove_unqualified(const char *name)
return 0;
}
+static void globalvar_nv_sync(const char *name)
+{
+ const char *val;
+
+ val = dev_get_param(&nv_device, name);
+ if (val)
+ dev_set_param(&global_device, name, val);
+}
+
int globalvar_add_simple_string(const char *name, char **value)
{
struct param_d *p;