From e9665959edeba6ae2d5364c4f7339704b6b6fd42 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Fri, 21 Jan 2022 17:06:20 -0800 Subject: treewide: Remove "ERROR: "/"WARN: " prefixes from log messages Now that the console system itself will clearly differentiate loglevels, it is no longer necessary to explicitly add "ERROR: " in front of every BIOS_ERR message to help it stand out more (and allow automated tooling to grep for it). Removing all these extra .rodata characters should save us a nice little amount of binary size. This patch was created by running find src/ -type f -exec perl -0777 -pi -e 's/printk\(\s*BIOS_ERR,\s*"ERROR: /printk\(BIOS_ERR, "/gi' '{}' ';' and doing some cursory review/cleanup on the result. Then doing the same thing for BIOS_WARN with 's/printk\(\s*BIOS_WARNING,\s*"WARN(ING)?: /printk\(BIOS_WARNING, "/gi' Signed-off-by: Julius Werner Change-Id: I3d0573acb23d2df53db6813cb1a5fc31b5357db8 Reviewed-on: https://review.coreboot.org/c/coreboot/+/61309 Tested-by: build bot (Jenkins) Reviewed-by: HAOUAS Elyes Reviewed-by: Lance Zhao Reviewed-by: Jason Glenesk --- src/soc/amd/cezanne/data_fabric.c | 5 ++--- src/soc/amd/cezanne/i2c.c | 2 +- src/soc/amd/cezanne/root_complex.c | 4 ++-- src/soc/amd/cezanne/smihandler.c | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/soc/amd/cezanne') diff --git a/src/soc/amd/cezanne/data_fabric.c b/src/soc/amd/cezanne/data_fabric.c index 2a13d2053fed..97cff28584e0 100644 --- a/src/soc/amd/cezanne/data_fabric.c +++ b/src/soc/amd/cezanne/data_fabric.c @@ -66,8 +66,7 @@ void data_fabric_set_mmio_np(void) /* Although a pair could be freed later, this condition is * very unusual and deserves analysis. Flag an error and * leave the topmost part unconfigured. */ - printk(BIOS_ERR, - "Error: Not enough NB MMIO routing registers\n"); + printk(BIOS_ERR, "Not enough NB MMIO routing registers\n"); continue; } data_fabric_broadcast_write32(0, NB_MMIO_BASE(reg), np_top + 1); @@ -85,7 +84,7 @@ void data_fabric_set_mmio_np(void) reg = data_fabric_find_unused_mmio_reg(); if (reg < 0) { - printk(BIOS_ERR, "Error: cannot configure region as NP\n"); + printk(BIOS_ERR, "cannot configure region as NP\n"); return; } diff --git a/src/soc/amd/cezanne/i2c.c b/src/soc/amd/cezanne/i2c.c index bf47b81462ac..ae49a064e058 100644 --- a/src/soc/amd/cezanne/i2c.c +++ b/src/soc/amd/cezanne/i2c.c @@ -24,7 +24,7 @@ static struct soc_i2c_ctrlr_info i2c_ctrlr[I2C_CTRLR_COUNT] = { void i2c_set_bar(unsigned int bus, uintptr_t bar) { if (bus >= ARRAY_SIZE(i2c_ctrlr)) { - printk(BIOS_ERR, "Error: i2c index out of bounds: %u.", bus); + printk(BIOS_ERR, "i2c index out of bounds: %u.", bus); return; } diff --git a/src/soc/amd/cezanne/root_complex.c b/src/soc/amd/cezanne/root_complex.c index f101680228fc..dde59d4deedc 100644 --- a/src/soc/amd/cezanne/root_complex.c +++ b/src/soc/amd/cezanne/root_complex.c @@ -141,7 +141,7 @@ static void read_resources(struct device *dev) mmconf_resource(dev, MMIO_CONF_BASE); if (!hob) { - printk(BIOS_ERR, "Error: %s incomplete because no HOB list was found\n", + printk(BIOS_ERR, "%s incomplete because no HOB list was found\n", __func__); return; } @@ -163,7 +163,7 @@ static void read_resources(struct device *dev) else if (res->type == EFI_RESOURCE_MEMORY_RESERVED) reserved_ram_resource(dev, idx++, res->addr / KiB, res->length / KiB); else - printk(BIOS_ERR, "Error: failed to set resources for type %d\n", + printk(BIOS_ERR, "failed to set resources for type %d\n", res->type); } diff --git a/src/soc/amd/cezanne/smihandler.c b/src/soc/amd/cezanne/smihandler.c index 2549ef8e2eca..509a1d404aac 100644 --- a/src/soc/amd/cezanne/smihandler.c +++ b/src/soc/amd/cezanne/smihandler.c @@ -121,7 +121,7 @@ static void fch_slp_typ_handler(void) psp_notify_sx_info(ACPI_S3); smu_sx_entry(); /* Leave SlpTypeEn clear, SMU will set */ - printk(BIOS_ERR, "Error: System did not go to sleep\n"); + printk(BIOS_ERR, "System did not go to sleep\n"); hlt(); } } -- cgit v1.2.3