summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-06-13 16:03:49 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2017-06-14 09:31:38 +0200
commit685f1eaabc85354dc1107088ab053b81fa1ec834 (patch)
tree04193a28c2b46228b46459315fc42b7d0d3e35d0
parent84c27193158d79c53b4b378c3fb571554afd7e0c (diff)
downloadbarebox-685f1eaabc85354dc1107088ab053b81fa1ec834.tar.gz
Revert "nv: Fix setting of nv.dev.<devname>.<param> variables"
This reverts commit eaf884ba55def055fd81ff3291a1a534fc8bd8f9.
-rw-r--r--common/globalvar.c65
1 files changed, 42 insertions, 23 deletions
diff --git a/common/globalvar.c b/common/globalvar.c
index 71daff7..aad19c6 100644
--- a/common/globalvar.c
+++ b/common/globalvar.c
@@ -120,21 +120,28 @@ void dev_param_init_from_nv(struct device_d *dev, const char *name)
}
/**
- * nvvar_device_set - set device parameter dev.<dev>.<param>
+ * nvvar_device_dispatch - dispatch dev.<dev>.<param> name into device and parameter name
* @name: The incoming name in the form dev.<dev>.<param>
- * val: The value <dev>.<param> should be set to
+ * @dev: The returned device_d * belonging to <dev>
+ * @pname: the parameter name
*
- * Given a dev.<dev>.<param> string this function sets the corresponding parameter
- * in the struct device_d * named <param> to @val.
+ * Given a dev.<dev>.<param> string this function finds the device_d * belonging to
+ * <dev> and the parameter name from <param>.
*
- * Return: 0 for success, negative error code for failure
+ * Return: When incoming string does not belong to the device namespace (does not begin
+ * with "dev." this function returns 0. A value > 0 is returned when the incoming string
+ * is in the device namespace and the string can be dispatched into a device_d * and a
+ * parameter name. A negative error code is returned when the incoming string belongs to
+ * the device namespace, but cannot be dispatched.
*/
-static int nvvar_device_set(const char *name, const char *val)
+static int nvvar_device_dispatch(const char *name, struct device_d **dev,
+ const char **pname)
{
- struct device_d *dev;
char *devname;
- const char *dot, *pname;
- int dotpos, ret;
+ const char *dot;
+ int dotpos;
+
+ *dev = NULL;
if (strncmp(name, "dev.", 4))
return 0;
@@ -148,20 +155,15 @@ static int nvvar_device_set(const char *name, const char *val)
dotpos = dot - name;
devname = xstrndup(name, dotpos);
- dev = get_device_by_name(devname);
+ *dev = get_device_by_name(devname);
free(devname);
- if (dev == &nv_device || dev == &global_device)
+ if (*dev == &nv_device || *dev == &global_device)
return -EINVAL;
- pname = dot + 1;
-
- ret = dev_set_param(dev, pname, val);
- if (ret)
- pr_err("Cannot init param from nv: %s.%s=%s: %s\n",
- dev_name(dev), pname, val, strerror(-ret));
+ *pname = dot + 1;
- return 0;
+ return 1;
}
static int nv_set(struct device_d *dev, struct param_d *p, const char *val)
@@ -172,10 +174,6 @@ static int nv_set(struct device_d *dev, struct param_d *p, const char *val)
if (!val)
val = "";
- ret = nvvar_device_set(p->name, val);
- if (ret)
- return ret;
-
g = get_param_by_name(&global_device, p->name);
if (g) {
ret = dev_set_param(&global_device, p->name, val);
@@ -375,6 +373,27 @@ void globalvar_set_match(const char *match, const char *val)
}
}
+static int globalvar_simple_set(struct param_d *p, const char *val)
+{
+ struct device_d *rdev;
+ const char *pname = NULL;
+ int ret;
+
+ ret = nvvar_device_dispatch(p->name, &rdev, &pname);
+ if (ret < 0)
+ return ret;
+
+ if (ret && rdev) {
+ ret = dev_set_param(rdev, pname, val);
+ if (ret)
+ pr_err("Cannot init param from global: %s.%s=%s: %s\n",
+ dev_name(rdev), pname, val, strerror(-ret));
+ }
+
+ /* Pass to the generic function we have overwritten */
+ return dev_param_set_generic(p, val);
+}
+
static void globalvar_nv_sync(const char *name)
{
const char *val;
@@ -396,7 +415,7 @@ int globalvar_add_simple(const char *name, const char *value)
{
struct param_d *param;
- param = dev_add_param(&global_device, name, NULL, NULL,
+ param = dev_add_param(&global_device, name, globalvar_simple_set, NULL,
0);
if (IS_ERR(param)) {
if (PTR_ERR(param) != -EEXIST)