diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-15 13:43:03 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-15 13:43:03 +0100 |
| commit | 7c2517c2444fdd5c2eceee330a03ff15d12602ca (patch) | |
| tree | 1770d5217d689f0513bb1534c7e4dfbf114800fc /common | |
| parent | cbc25b2b8488452085d3195dfc7164b00a265364 (diff) | |
| parent | 0473048c4fa5410b0c4a75f667f7b317e44c15df (diff) | |
| download | barebox-7c2517c2444fdd5c2eceee330a03ff15d12602ca.tar.gz barebox-7c2517c2444fdd5c2eceee330a03ff15d12602ca.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'common')
| -rw-r--r-- | common/memory_display.c | 2 | ||||
| -rw-r--r-- | common/state/state_variables.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/common/memory_display.c b/common/memory_display.c index cd0eadf88d..fbb8bbb6fa 100644 --- a/common/memory_display.c +++ b/common/memory_display.c @@ -96,7 +96,7 @@ int __pr_memory_display(int level, const void *addr, loff_t offs, unsigned nbyte offs += size; } - pos += sprintf(pos, "%*s", 61 - (pos - line), ""); + pos += sprintf(pos, "%*s", (int)(61 - (pos - line)), ""); cp = linebuf; for (i = 0; i < linebytes; i++) { diff --git a/common/state/state_variables.c b/common/state/state_variables.c index 269d175874..6a00c82203 100644 --- a/common/state/state_variables.c +++ b/common/state/state_variables.c @@ -102,7 +102,7 @@ static int state_uint8_set(struct param_d *p, void *priv) static struct state_variable *state_uint8_create(struct state *state, const char *name, struct device_node *node, - const struct variable_type *vtype) + const struct variable_type *vtype) { struct state_uint32 *su32; struct param_d *param; @@ -132,7 +132,7 @@ static struct state_variable *state_uint8_create(struct state *state, static struct state_variable *state_uint32_create(struct state *state, const char *name, struct device_node *node, - const struct variable_type *vtype) + const struct variable_type *vtype) { struct state_uint32 *su32; struct param_d *param; @@ -223,7 +223,7 @@ static int state_enum32_import(struct state_variable *sv, static struct state_variable *state_enum32_create(struct state *state, const char *name, struct device_node *node, - const struct variable_type *vtype) + const struct variable_type *vtype) { struct state_enum32 *enum32; int ret, i, num_names; @@ -307,7 +307,7 @@ static int state_mac_import(struct state_variable *sv, struct device_node *node) static struct state_variable *state_mac_create(struct state *state, const char *name, struct device_node *node, - const struct variable_type *vtype) + const struct variable_type *vtype) { struct state_mac *mac; int ret; @@ -409,7 +409,7 @@ static int state_string_get(struct param_d *p, void *priv) static struct state_variable *state_string_create(struct state *state, const char *name, struct device_node *node, - const struct variable_type *vtype) + const struct variable_type *vtype) { struct state_string *string; uint32_t start_size[2]; |