mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 08:42:12 +02:00
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
@@ -303,12 +303,12 @@ static int test_readonly(void)
|
||||
index_0 += 1;
|
||||
if (tpm_nv_write_value(INDEX0, (uint8_t *)&index_0, sizeof(index_0) !=
|
||||
TPM_SUCCESS)) {
|
||||
error("\tcould not write index 0\n");
|
||||
pr_err("\tcould not write index 0\n");
|
||||
}
|
||||
tpm_nv_write_value_lock(INDEX0);
|
||||
if (tpm_nv_write_value(INDEX0, (uint8_t *)&index_0, sizeof(index_0)) ==
|
||||
TPM_SUCCESS)
|
||||
error("\tindex 0 is not locked\n");
|
||||
pr_err("\tindex 0 is not locked\n");
|
||||
|
||||
printf("\tdone\n");
|
||||
return 0;
|
||||
@@ -471,7 +471,7 @@ static int test_write_limit(void)
|
||||
case TPM_MAXNVWRITES:
|
||||
assert(i >= TPM_MAX_NV_WRITES_NOOWNER);
|
||||
default:
|
||||
error("\tunexpected error code %d (0x%x)\n",
|
||||
pr_err("\tunexpected error code %d (0x%x)\n",
|
||||
result, result);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user