treewide: replace with error() with pr_err()
U-Boot widely uses error() as a bit noisier variant of printf(). This macro causes name conflict with the following line in include/linux/compiler-gcc.h: # define __compiletime_error(message) __attribute__((error(message))) This prevents us from using __compiletime_error(), and makes it difficult to fully sync BUILD_BUG macros with Linux. (Notice Linux's BUILD_BUG_ON_MSG is implemented by using compiletime_assert().) Let's convert error() into now treewide-available pr_err(). Done with the help of Coccinelle, excluing tools/ directory. The semantic patch I used is as follows: // <smpl> @@@@ -error +pr_err (...) // </smpl> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org> [trini: Re-run Coccinelle] Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
committed by
Tom Rini
parent
b44b30260f
commit
9b643e312d
8
env/common.c
vendored
8
env/common.c
vendored
@@ -84,7 +84,7 @@ void set_default_env(const char *s)
|
||||
if (himport_r(&env_htab, (char *)default_environment,
|
||||
sizeof(default_environment), '\0', flags, 0,
|
||||
0, NULL) == 0)
|
||||
error("Environment import failed: errno = %d\n", errno);
|
||||
pr_err("Environment import failed: errno = %d\n", errno);
|
||||
|
||||
gd->flags |= GD_FLG_ENV_READY;
|
||||
gd->flags |= GD_FLG_ENV_DEFAULT;
|
||||
@@ -172,7 +172,7 @@ int env_import(const char *buf, int check)
|
||||
/* Decrypt the env if desired. */
|
||||
ret = env_aes_cbc_crypt(ep, 0);
|
||||
if (ret) {
|
||||
error("Failed to decrypt env!\n");
|
||||
pr_err("Failed to decrypt env!\n");
|
||||
set_default_env("!import failed");
|
||||
return ret;
|
||||
}
|
||||
@@ -183,7 +183,7 @@ int env_import(const char *buf, int check)
|
||||
return 1;
|
||||
}
|
||||
|
||||
error("Cannot import environment: errno = %d\n", errno);
|
||||
pr_err("Cannot import environment: errno = %d\n", errno);
|
||||
|
||||
set_default_env("!import failed");
|
||||
|
||||
@@ -247,7 +247,7 @@ int env_export(env_t *env_out)
|
||||
res = (char *)env_out->data;
|
||||
len = hexport_r(&env_htab, '\0', 0, &res, ENV_SIZE, 0, NULL);
|
||||
if (len < 0) {
|
||||
error("Cannot export environment: errno = %d\n", errno);
|
||||
pr_err("Cannot export environment: errno = %d\n", errno);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user