diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-14 12:46:49 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-14 12:46:49 +0200 |
| commit | 3b9ce49e17897cc053ed8416685e79902d7432a1 (patch) | |
| tree | 324019c1b5ad3c9cf8dce274291008d6ff4d49e7 /common | |
| parent | d2bb6342d6a812f3ff0dcf17180c0b01b85cacfb (diff) | |
| parent | 9699096f1eccd742d898f471b046181ea90dd582 (diff) | |
| download | barebox-3b9ce49e17897cc053ed8416685e79902d7432a1.tar.gz barebox-3b9ce49e17897cc053ed8416685e79902d7432a1.tar.xz | |
Merge branch 'for-next/percent_pe' into master
Diffstat (limited to 'common')
| -rw-r--r-- | common/bootm.c | 3 | ||||
| -rw-r--r-- | common/state/state.c | 3 | ||||
| -rw-r--r-- | common/usbgadget.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/common/bootm.c b/common/bootm.c index 8219183b8b..f70ef10100 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -648,8 +648,7 @@ int bootm_boot(struct bootm_data *bootm_data) fit = fit_open(data->os_file, data->verbose, data->verify); if (IS_ERR(fit)) { - printf("Loading FIT image %s failed with: %s\n", data->os_file, - strerrorp(fit)); + printf("Loading FIT image %s failed with: %pe\n", data->os_file, fit); ret = PTR_ERR(fit); goto err_out; } diff --git a/common/state/state.c b/common/state/state.c index d42920985d..9d04eab312 100644 --- a/common/state/state.c +++ b/common/state/state.c @@ -271,9 +271,8 @@ static int state_convert_node_variable(struct state *state, if (conv == STATE_CONVERT_FROM_NODE_CREATE) { sv = vtype->create(state, name, node, vtype); if (IS_ERR(sv)) { + dev_err(&state->dev, "failed to create %s: %pe\n", name, sv); ret = PTR_ERR(sv); - dev_err(&state->dev, "failed to create %s: %s\n", name, - strerror(-ret)); goto out_free; } diff --git a/common/usbgadget.c b/common/usbgadget.c index 51ee9c106c..1790310f79 100644 --- a/common/usbgadget.c +++ b/common/usbgadget.c @@ -35,8 +35,7 @@ static struct file_list *parse(const char *files) { struct file_list *list = file_list_parse(files); if (IS_ERR(list)) { - pr_err("Parsing file list \"%s\" failed: %s\n", files, - strerrorp(list)); + pr_err("Parsing file list \"%s\" failed: %pe\n", files, list); return NULL; } return list; |