summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-06-13 16:04:49 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2017-06-14 09:31:39 +0200
commitf7d26d1750df3dcada3d8b0de88951cddc1e19f0 (patch)
tree95ccb90aaaa098636c52af7276389c69196c8acb
parent5d2958bfb382c67b1cb712d372ebfc45afeb8288 (diff)
downloadbarebox-f7d26d1750df3dcada3d8b0de88951cddc1e19f0.tar.gz
Revert "globalvar: remove code for unqualified globalvars"
This reverts commit e4f81050e098074792730b61563538d9e394e3d6.
-rw-r--r--common/globalvar.c43
-rw-r--r--include/param.h1
2 files changed, 43 insertions, 1 deletions
diff --git a/common/globalvar.c b/common/globalvar.c
index 32ca6a2..1b3082a 100644
--- a/common/globalvar.c
+++ b/common/globalvar.c
@@ -410,7 +410,7 @@ int globalvar_add_simple(const char *name, const char *value)
struct param_d *param;
param = dev_add_param(&global_device, name, globalvar_simple_set, NULL,
- 0);
+ PARAM_GLOBALVAR_UNQUALIFIED);
if (IS_ERR(param)) {
if (PTR_ERR(param) != -EEXIST)
return PTR_ERR(param);
@@ -424,9 +424,30 @@ int globalvar_add_simple(const char *name, const char *value)
return 0;
}
+static int globalvar_remove_unqualified(const char *name)
+{
+ struct param_d *p;
+
+ p = get_param_by_name(&global_device, name);
+ if (!p)
+ return 0;
+
+ if (!(p->flags & PARAM_GLOBALVAR_UNQUALIFIED))
+ return -EEXIST;
+
+ dev_remove_param(p);
+
+ return 0;
+}
+
int globalvar_add_simple_string(const char *name, char **value)
{
struct param_d *p;
+ int ret;
+
+ ret = globalvar_remove_unqualified(name);
+ if (ret)
+ return ret;
p = dev_add_param_string(&global_device, name, NULL, NULL,
value, NULL);
@@ -443,6 +464,11 @@ int globalvar_add_simple_int(const char *name, int *value,
const char *format)
{
struct param_d *p;
+ int ret;
+
+ ret = globalvar_remove_unqualified(name);
+ if (ret)
+ return ret;
p = dev_add_param_int(&global_device, name, NULL, NULL,
value, format, NULL);
@@ -458,6 +484,11 @@ int globalvar_add_simple_int(const char *name, int *value,
int globalvar_add_simple_bool(const char *name, int *value)
{
struct param_d *p;
+ int ret;
+
+ ret = globalvar_remove_unqualified(name);
+ if (ret)
+ return ret;
p = dev_add_param_bool(&global_device, name, NULL, NULL,
value, NULL);
@@ -474,6 +505,11 @@ int globalvar_add_simple_enum(const char *name, int *value,
const char * const *names, int max)
{
struct param_d *p;
+ int ret;
+
+ ret = globalvar_remove_unqualified(name);
+ if (ret)
+ return ret;
p = dev_add_param_enum(&global_device, name, NULL, NULL,
value, names, max, NULL);
@@ -503,6 +539,11 @@ int globalvar_add_simple_bitmask(const char *name, unsigned long *value,
int globalvar_add_simple_ip(const char *name, IPaddr_t *ip)
{
struct param_d *p;
+ int ret;
+
+ ret = globalvar_remove_unqualified(name);
+ if (ret)
+ return ret;
p = dev_add_param_ip(&global_device, name, NULL, NULL,
ip, NULL);
diff --git a/include/param.h b/include/param.h
index 5eed97e..91f8aa3 100644
--- a/include/param.h
+++ b/include/param.h
@@ -6,6 +6,7 @@
#include <linux/list.h>
#define PARAM_FLAG_RO (1 << 0)
+#define PARAM_GLOBALVAR_UNQUALIFIED (1 << 1)
struct device_d;
typedef uint32_t IPaddr_t;