Skip to content

Commit

Permalink
Revert "param: remove unnecessary device_d * argument"
Browse files Browse the repository at this point in the history 
This reverts commit 0071bac.
  • Loading branch information
@saschahauer
saschahauer committed Jun 13, 2017
1 parent d1c0aa3 commit 7917ad2
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 34 deletions.
14 changes: 7 additions & 7 deletions common/globalvar.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ static int nvvar_device_dispatch(const char *name, struct device_d **dev,
return 1;
}

static int nv_set(struct param_d *p, const char *val)
static int nv_set(struct device_d *dev, struct param_d *p, const char *val)
{
struct param_d *g;
int ret;
Expand All @@ -184,16 +184,16 @@ static int nv_set(struct param_d *p, const char *val)
return 0;
}

static const char *nv_param_get(struct param_d *p)
static const char *nv_param_get(struct device_d *dev, struct param_d *p)
{
return p->value ? p->value : "";
}

static int nv_param_set(struct param_d *p, const char *val)
static int nv_param_set(struct device_d *dev, struct param_d *p, const char *val)
{
int ret;

ret = nv_set(p, val);
ret = nv_set(dev, p, val);
if (ret)
return ret;

Expand All @@ -216,7 +216,7 @@ static int __nvvar_add(const char *name, const char *value)
}

if (value)
return nv_set(p, value);
return nv_set(&nv_device, p, value);

value = dev_get_param(&global_device, name);
if (value) {
Expand Down Expand Up @@ -370,7 +370,7 @@ void globalvar_set_match(const char *match, const char *val)
}
}

static int globalvar_simple_set(struct param_d *p, const char *val)
static int globalvar_simple_set(struct device_d *dev, struct param_d *p, const char *val)
{
struct device_d *rdev;
const char *pname = NULL;
Expand All @@ -388,7 +388,7 @@ static int globalvar_simple_set(struct param_d *p, const char *val)
}

/* Pass to the generic function we have overwritten */
return dev_param_set_generic(p, val);
return dev_param_set_generic(dev, p, val);
}

static void globalvar_nv_sync(const char *name)
Expand Down
11 changes: 6 additions & 5 deletions include/param.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ enum param_type {
};

struct param_d {
const char* (*get)(struct param_d *param);
int (*set)(struct param_d *param, const char *val);
const char* (*get)(struct device_d *, struct param_d *param);
int (*set)(struct device_d *, struct param_d *param, const char *val);
void (*info)(struct param_d *param);
unsigned int flags;
char *name;
Expand All @@ -43,8 +43,8 @@ int dev_set_param(struct device_d *dev, const char *name, const char *val);
struct param_d *get_param_by_name(struct device_d *dev, const char *name);

struct param_d *dev_add_param(struct device_d *dev, const char *name,
int (*set)(struct param_d *p, const char *val),
const char *(*get)(struct param_d *p),
int (*set)(struct device_d *dev, struct param_d *p, const char *val),
const char *(*get)(struct device_d *, struct param_d *p),
unsigned long flags);

struct param_d *dev_add_param_string(struct device_d *dev, const char *name,
Expand Down Expand Up @@ -83,7 +83,8 @@ void dev_remove_param(struct param_d *p);

void dev_remove_parameters(struct device_d *dev);

int dev_param_set_generic(struct param_d *p, const char *val);
int dev_param_set_generic(struct device_d *dev, struct param_d *p,
const char *val);

#else
static inline const char *dev_get_param(struct device_d *dev, const char *name)
Expand Down
44 changes: 22 additions & 22 deletions lib/parameter.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const char *dev_get_param(struct device_d *dev, const char *name)
return NULL;
}

return param->get(param);
return param->get(dev, param);
}

/**
Expand Down Expand Up @@ -107,7 +107,7 @@ int dev_set_param(struct device_d *dev, const char *name, const char *val)
return -EACCES;
}

ret = param->set(param, val);
ret = param->set(dev, param, val);
if (ret)
errno = -ret;

Expand All @@ -125,7 +125,7 @@ int dev_set_param(struct device_d *dev, const char *name, const char *val)
* used during deregistration of the parameter to free the alloctated
* memory.
*/
int dev_param_set_generic(struct param_d *p,
int dev_param_set_generic(struct device_d *dev, struct param_d *p,
const char *val)
{
free(p->value);
Expand All @@ -137,7 +137,7 @@ int dev_param_set_generic(struct param_d *p,
return p->value ? 0 : -ENOMEM;
}

static const char *param_get_generic(struct param_d *p)
static const char *param_get_generic(struct device_d *dev, struct param_d *p)
{
return p->value ? p->value : "";
}
Expand All @@ -151,8 +151,8 @@ static int compare(struct list_head *a, struct list_head *b)
}

static int __dev_add_param(struct param_d *param, struct device_d *dev, const char *name,
int (*set)(struct param_d *p, const char *val),
const char *(*get)(struct param_d *p),
int (*set)(struct device_d *dev, struct param_d *p, const char *val),
const char *(*get)(struct device_d *dev, struct param_d *p),
unsigned long flags)
{
if (get_param_by_name(dev, name))
Expand Down Expand Up @@ -194,8 +194,8 @@ static int __dev_add_param(struct param_d *param, struct device_d *dev, const ch
* not use static arrays when using the generic functions.
*/
struct param_d *dev_add_param(struct device_d *dev, const char *name,
int (*set)(struct param_d *p, const char *val),
const char *(*get)(struct param_d *param),
int (*set)(struct device_d *dev, struct param_d *p, const char *val),
const char *(*get)(struct device_d *dev, struct param_d *param),
unsigned long flags)
{
struct param_d *param;
Expand Down Expand Up @@ -248,7 +248,7 @@ static inline struct param_string *to_param_string(struct param_d *p)
return container_of(p, struct param_string, param);
}

static int param_string_set(struct param_d *p, const char *val)
static int param_string_set(struct device_d *dev, struct param_d *p, const char *val)
{
struct param_string *ps = to_param_string(p);
int ret;
Expand All @@ -273,7 +273,7 @@ static int param_string_set(struct param_d *p, const char *val)
return ret;
}

static const char *param_string_get(struct param_d *p)
static const char *param_string_get(struct device_d *dev, struct param_d *p)
{
struct param_string *ps = to_param_string(p);
int ret;
Expand Down Expand Up @@ -327,7 +327,7 @@ static inline struct param_int *to_param_int(struct param_d *p)
return container_of(p, struct param_int, param);
}

static int param_int_set(struct param_d *p, const char *val)
static int param_int_set(struct device_d *dev, struct param_d *p, const char *val)
{
struct param_int *pi = to_param_int(p);
u8 value_save[pi->dsize];
Expand Down Expand Up @@ -368,7 +368,7 @@ static int param_int_set(struct param_d *p, const char *val)
return ret;
}

static const char *param_int_get(struct param_d *p)
static const char *param_int_get(struct device_d *dev, struct param_d *p)
{
struct param_int *pi = to_param_int(p);
int ret;
Expand Down Expand Up @@ -487,7 +487,7 @@ static inline struct param_enum *to_param_enum(struct param_d *p)
return container_of(p, struct param_enum, param);
}

static int param_enum_set(struct param_d *p, const char *val)
static int param_enum_set(struct device_d *dev, struct param_d *p, const char *val)
{
struct param_enum *pe = to_param_enum(p);
int value_save = *pe->value;
Expand Down Expand Up @@ -515,7 +515,7 @@ static int param_enum_set(struct param_d *p, const char *val)
return ret;
}

static const char *param_enum_get(struct param_d *p)
static const char *param_enum_get(struct device_d *dev, struct param_d *p)
{
struct param_enum *pe = to_param_enum(p);
int ret;
Expand Down Expand Up @@ -599,7 +599,7 @@ static inline struct param_bitmask *to_param_bitmask(struct param_d *p)
return container_of(p, struct param_bitmask, param);
}

static int param_bitmask_set(struct param_d *p, const char *val)
static int param_bitmask_set(struct device_d *dev, struct param_d *p, const char *val)
{
struct param_bitmask *pb = to_param_bitmask(p);
void *value_save;
Expand Down Expand Up @@ -645,7 +645,7 @@ static int param_bitmask_set(struct param_d *p, const char *val)
return ret;
}

static const char *param_bitmask_get(struct param_d *p)
static const char *param_bitmask_get(struct device_d *dev, struct param_d *p)
{
struct param_bitmask *pb = to_param_bitmask(p);
int ret, bit;
Expand Down Expand Up @@ -734,7 +734,7 @@ static inline struct param_ip *to_param_ip(struct param_d *p)
return container_of(p, struct param_ip, param);
}

static int param_ip_set(struct param_d *p, const char *val)
static int param_ip_set(struct device_d *dev, struct param_d *p, const char *val)
{
struct param_ip *pi = to_param_ip(p);
IPaddr_t ip_save = *pi->ip;
Expand All @@ -757,7 +757,7 @@ static int param_ip_set(struct param_d *p, const char *val)
return ret;
}

static const char *param_ip_get(struct param_d *p)
static const char *param_ip_get(struct device_d *dev, struct param_d *p)
{
struct param_ip *pi = to_param_ip(p);
int ret;
Expand Down Expand Up @@ -816,7 +816,7 @@ static inline struct param_mac *to_param_mac(struct param_d *p)
return container_of(p, struct param_mac, param);
}

static int param_mac_set(struct param_d *p, const char *val)
static int param_mac_set(struct device_d *dev, struct param_d *p, const char *val)
{
struct param_mac *pm = to_param_mac(p);
char mac_save[6];
Expand Down Expand Up @@ -845,7 +845,7 @@ static int param_mac_set(struct param_d *p, const char *val)
return ret;
}

static const char *param_mac_get(struct param_d *p)
static const char *param_mac_get(struct device_d *dev, struct param_d *p)
{
struct param_mac *pm = to_param_mac(p);
int ret;
Expand Down Expand Up @@ -894,7 +894,7 @@ struct param_d *dev_add_param_mac(struct device_d *dev, const char *name,
*/
void dev_remove_param(struct param_d *p)
{
p->set(p, NULL);
p->set(p->dev, p, NULL);
list_del(&p->list);
free(p->name);
free(p);
Expand All @@ -910,7 +910,7 @@ void dev_remove_parameters(struct device_d *dev)
struct param_d *p, *n;

list_for_each_entry_safe(p, n, &dev->parameters, list) {
p->set(p, NULL);
p->set(dev, p, NULL);
list_del(&p->list);
free(p->name);
free(p);
Expand Down

0 comments on commit 7917ad2

Please sign in to comment.