/: Remove "ERROR: "/"WARNING: " prefixes from log messages

It is no longer necessary to explicitly add "ERROR: "/"WARNING: " in
front of every BIOS_ERR/BIOS_WARN message.

Change-Id: I22ee6ae15c3d3a848853c5460b3b3c1795adf2f5
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69405
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>

16 files changed, 32 insertions, 32 deletions

diff --git a/src/commonlib/fsp_relocate.c b/src/commonlib/fsp_relocate.c
index 8dabad5643..55295cac2d 100644
--- a/src/commonlib/fsp_relocate.c
+++ b/src/commonlib/fsp_relocate.c
@@ -259,10 +259,10 @@ static int pe_relocate(uintptr_t new_addr, void *pe, void *fsp, size_t fih_off)
 				write_le32(&pe_base[aoff], val + delta);
 				break;
 			case EFI_IMAGE_REL_BASED_DIR64:
-				printk(BIOS_ERR, "Error: Unsupported DIR64\n");
+				printk(BIOS_ERR, "Unsupported DIR64\n");
 				break;
 			default:
-				printk(BIOS_ERR, "Error: Unsupported relocation type %d\n",
+				printk(BIOS_ERR, "Unsupported relocation type %d\n",
 						rtype);
 				return -1;
 			}
diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 70af9c558a..16c31ea221 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -408,7 +408,7 @@ static void configure_adjustable_base(const struct device *dev,
 
 	int max_requested_bits = __fls64(size_mask);
 	if (max_requested_bits > CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS) {
-		printk(BIOS_WARNING, "WARNING: Device %s requests a BAR with"
+		printk(BIOS_WARNING, "Device %s requests a BAR with"
 		       " %u bits of address space, which coreboot is not"
 		       " configured to hand out, truncating to %u bits\n",
 		       dev_path(dev), max_requested_bits,
@@ -417,7 +417,7 @@ static void configure_adjustable_base(const struct device *dev,
 	}
 
 	if (!(res->flags & IORESOURCE_PCI64) && max_requested_bits > 32) {
-		printk(BIOS_ERR, "ERROR: Resizable BAR requested"
+		printk(BIOS_ERR, "Resizable BAR requested"
 		       " above 32 bits, but PCI function reported a"
 		       " 32-bit BAR.");
 		return;
diff --git a/src/soc/amd/glinda/i2c.c b/src/soc/amd/glinda/i2c.c
index 97b982b069..bd3d4dc4f0 100644
--- a/src/soc/amd/glinda/i2c.c
+++ b/src/soc/amd/glinda/i2c.c
@@ -34,7 +34,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/glinda/psp_verstage/chipset.c b/src/soc/amd/glinda/psp_verstage/chipset.c
index 2366909c13..b266fc2820 100644
--- a/src/soc/amd/glinda/psp_verstage/chipset.c
+++ b/src/soc/amd/glinda/psp_verstage/chipset.c
@@ -24,7 +24,7 @@ void update_psp_fw_hash_table(const char *fname)
 	uint32_t len;
 
 	if (!spi_ptr) {
-		printk(BIOS_ERR, "Error: AMD Firmware hash table %s not found\n", fname);
+		printk(BIOS_ERR, "AMD Firmware hash table %s not found\n", fname);
 		/*
 		 * If we don't supply hash table, the PSP will refuse to boot.
 		 * So returning here is safe to do.
@@ -36,7 +36,7 @@ void update_psp_fw_hash_table(const char *fname)
 
 	if (hash_table.no_of_entries_256 > MAX_NUM_HASH_ENTRIES ||
 			hash_table.no_of_entries_384 > MAX_NUM_HASH_ENTRIES) {
-		printk(BIOS_ERR, "Error: Too many entries in AMD Firmware hash table"
+		printk(BIOS_ERR, "Too many entries in AMD Firmware hash table"
 				 " (SHA256:%d, SHA384:%d)\n",
 				 hash_table.no_of_entries_256, hash_table.no_of_entries_384);
 		return;
@@ -44,7 +44,7 @@ void update_psp_fw_hash_table(const char *fname)
 
 	if (hash_table.no_of_entries_256 == 0 &&
 			hash_table.no_of_entries_384 == 0) {
-		printk(BIOS_ERR, "Error: No entries in AMD Firmware hash table"
+		printk(BIOS_ERR, "No entries in AMD Firmware hash table"
 				 " (SHA256:%d, SHA384:%d)\n",
 				 hash_table.no_of_entries_256, hash_table.no_of_entries_384);
 		return;
diff --git a/src/soc/amd/glinda/root_complex.c b/src/soc/amd/glinda/root_complex.c
index ef6c630d05..2a4a547ae0 100644
--- a/src/soc/amd/glinda/root_complex.c
+++ b/src/soc/amd/glinda/root_complex.c
@@ -158,7 +158,7 @@ static void read_resources(struct device *dev)
 	mmconf_resource(dev, idx++);
 
 	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;
 	}
@@ -180,7 +180,7 @@ static void read_resources(struct device *dev)
 		else if (res->type == EFI_RESOURCE_MEMORY_RESERVED)
 			reserved_ram_resource_kb(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/glinda/smihandler.c b/src/soc/amd/glinda/smihandler.c
index 95d12bf74f..9cc34b5b6b 100644
--- a/src/soc/amd/glinda/smihandler.c
+++ b/src/soc/amd/glinda/smihandler.c
@@ -100,7 +100,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();
 	}
 }
diff --git a/src/soc/amd/mendocino/i2c.c b/src/soc/amd/mendocino/i2c.c
index 75efe0c45f..92e46b9020 100644
--- a/src/soc/amd/mendocino/i2c.c
+++ b/src/soc/amd/mendocino/i2c.c
@@ -32,7 +32,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/mendocino/psp_verstage/chipset.c b/src/soc/amd/mendocino/psp_verstage/chipset.c
index b89627981c..fe79979fbe 100644
--- a/src/soc/amd/mendocino/psp_verstage/chipset.c
+++ b/src/soc/amd/mendocino/psp_verstage/chipset.c
@@ -24,7 +24,7 @@ void update_psp_fw_hash_table(const char *fname)
 	uint32_t len;
 
 	if (!spi_ptr) {
-		printk(BIOS_ERR, "Error: AMD Firmware hash table %s not found\n", fname);
+		printk(BIOS_ERR, "AMD Firmware hash table %s not found\n", fname);
 		/*
 		 * If we don't supply hash table, the PSP will refuse to boot.
 		 * So returning here is safe to do.
@@ -36,7 +36,7 @@ void update_psp_fw_hash_table(const char *fname)
 
 	if (hash_table.no_of_entries_256 > MAX_NUM_HASH_ENTRIES ||
 			hash_table.no_of_entries_384 > MAX_NUM_HASH_ENTRIES) {
-		printk(BIOS_ERR, "Error: Too many entries in AMD Firmware hash table"
+		printk(BIOS_ERR, "Too many entries in AMD Firmware hash table"
 				 " (SHA256:%d, SHA384:%d)\n",
 				 hash_table.no_of_entries_256, hash_table.no_of_entries_384);
 		return;
@@ -44,7 +44,7 @@ void update_psp_fw_hash_table(const char *fname)
 
 	if (hash_table.no_of_entries_256 == 0 &&
 			hash_table.no_of_entries_384 == 0) {
-		printk(BIOS_ERR, "Error: No entries in AMD Firmware hash table"
+		printk(BIOS_ERR, "No entries in AMD Firmware hash table"
 				 " (SHA256:%d, SHA384:%d)\n",
 				 hash_table.no_of_entries_256, hash_table.no_of_entries_384);
 		return;
diff --git a/src/soc/amd/mendocino/root_complex.c b/src/soc/amd/mendocino/root_complex.c
index 67686139b4..7feb7f7500 100644
--- a/src/soc/amd/mendocino/root_complex.c
+++ b/src/soc/amd/mendocino/root_complex.c
@@ -158,7 +158,7 @@ static void read_resources(struct device *dev)
 	mmconf_resource(dev, idx++);
 
 	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;
 	}
@@ -180,7 +180,7 @@ static void read_resources(struct device *dev)
 		else if (res->type == EFI_RESOURCE_MEMORY_RESERVED)
 			reserved_ram_resource_kb(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/mendocino/smihandler.c b/src/soc/amd/mendocino/smihandler.c
index c05f3eea3e..8e32b5d543 100644
--- a/src/soc/amd/mendocino/smihandler.c
+++ b/src/soc/amd/mendocino/smihandler.c
@@ -100,7 +100,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();
 	}
 }
diff --git a/src/soc/amd/morgana/i2c.c b/src/soc/amd/morgana/i2c.c
index 92dd00daa1..0e416cf8e3 100644
--- a/src/soc/amd/morgana/i2c.c
+++ b/src/soc/amd/morgana/i2c.c
@@ -32,7 +32,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/morgana/psp_verstage/chipset.c b/src/soc/amd/morgana/psp_verstage/chipset.c
index 539ddb4405..2f5fb44945 100644
--- a/src/soc/amd/morgana/psp_verstage/chipset.c
+++ b/src/soc/amd/morgana/psp_verstage/chipset.c
@@ -24,7 +24,7 @@ void update_psp_fw_hash_table(const char *fname)
 	uint32_t len;
 
 	if (!spi_ptr) {
-		printk(BIOS_ERR, "Error: AMD Firmware hash table %s not found\n", fname);
+		printk(BIOS_ERR, "AMD Firmware hash table %s not found\n", fname);
 		/*
 		 * If we don't supply hash table, the PSP will refuse to boot.
 		 * So returning here is safe to do.
@@ -36,7 +36,7 @@ void update_psp_fw_hash_table(const char *fname)
 
 	if (hash_table.no_of_entries_256 > MAX_NUM_HASH_ENTRIES ||
 			hash_table.no_of_entries_384 > MAX_NUM_HASH_ENTRIES) {
-		printk(BIOS_ERR, "Error: Too many entries in AMD Firmware hash table"
+		printk(BIOS_ERR, "Too many entries in AMD Firmware hash table"
 				 " (SHA256:%d, SHA384:%d)\n",
 				 hash_table.no_of_entries_256, hash_table.no_of_entries_384);
 		return;
@@ -44,7 +44,7 @@ void update_psp_fw_hash_table(const char *fname)
 
 	if (hash_table.no_of_entries_256 == 0 &&
 			hash_table.no_of_entries_384 == 0) {
-		printk(BIOS_ERR, "Error: No entries in AMD Firmware hash table"
+		printk(BIOS_ERR, "No entries in AMD Firmware hash table"
 				 " (SHA256:%d, SHA384:%d)\n",
 				 hash_table.no_of_entries_256, hash_table.no_of_entries_384);
 		return;
diff --git a/src/soc/amd/morgana/root_complex.c b/src/soc/amd/morgana/root_complex.c
index 88bcca75d2..1a4f0bd01f 100644
--- a/src/soc/amd/morgana/root_complex.c
+++ b/src/soc/amd/morgana/root_complex.c
@@ -158,7 +158,7 @@ static void read_resources(struct device *dev)
 	mmconf_resource(dev, idx++);
 
 	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;
 	}
@@ -180,7 +180,7 @@ static void read_resources(struct device *dev)
 		else if (res->type == EFI_RESOURCE_MEMORY_RESERVED)
 			reserved_ram_resource_kb(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/morgana/smihandler.c b/src/soc/amd/morgana/smihandler.c
index a1eabed208..d04f9a3f45 100644
--- a/src/soc/amd/morgana/smihandler.c
+++ b/src/soc/amd/morgana/smihandler.c
@@ -100,7 +100,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();
 	}
 }
diff --git a/src/soc/qualcomm/sc7280/display/edp_aux.c b/src/soc/qualcomm/sc7280/display/edp_aux.c
index 4e5f7da124..2d2821b382 100644
--- a/src/soc/qualcomm/sc7280/display/edp_aux.c
+++ b/src/soc/qualcomm/sc7280/display/edp_aux.c
@@ -32,13 +32,13 @@ static void edp_wait_for_aux_done(void)
 	u32 intr_status = 0;
 
 	if (!wait_ms(100, read32(&edp_auxclk->status) & EDP_AUX_INTERRUPT)) {
-		printk(BIOS_ERR, "ERROR: AUX SEND not acknowledged\n");
+		printk(BIOS_ERR, "AUX SEND not acknowledged\n");
 		return;
 	}
 
 	intr_status = read32(&edp_auxclk->status);
 	if (!(intr_status & AUX_INTR_I2C_DONE)) {
-		printk(BIOS_ERR, "ERROR: AUX command failed, status = %#x\n", intr_status);
+		printk(BIOS_ERR, "AUX command failed, status = %#x\n", intr_status);
 		return;
 	}
 
@@ -176,7 +176,7 @@ int edp_read_edid(struct edid *out)
 		err = edp_aux_transfer(EDID_I2C_ADDR, DP_AUX_I2C_READ, edid, EDID_LENGTH);
 
 	if (err < EDID_LENGTH) {
-		printk(BIOS_ERR, "ERROR: Failed to read EDID. :%d\n", err);
+		printk(BIOS_ERR, "Failed to read EDID. :%d\n", err);
 		return err;
 	}
 
@@ -196,7 +196,7 @@ int edp_read_edid(struct edid *out)
 	}
 
 	if (decode_edid(edid, edid_size, out) != EDID_CONFORMANT) {
-		printk(BIOS_ERR, "ERROR: Failed to decode EDID.\n");
+		printk(BIOS_ERR, "Failed to decode EDID.\n");
 		return CB_ERR;
 	}
 
diff --git a/src/soc/qualcomm/sc7280/display/edp_ctrl.c b/src/soc/qualcomm/sc7280/display/edp_ctrl.c
index e9254cc9e8..1455cace90 100644
--- a/src/soc/qualcomm/sc7280/display/edp_ctrl.c
+++ b/src/soc/qualcomm/sc7280/display/edp_ctrl.c
@@ -1375,7 +1375,7 @@ static int edp_ctrl_on(struct edp_ctrl *ctrl, struct edid *edid, uint8_t *dpcd)
 	if (dpcd[DP_DPCD_REV] >= 0x11) {
 		ret = edp_aux_transfer(DP_SET_POWER, DP_AUX_NATIVE_READ, &value, 1);
 		if (ret < 0) {
-			printk(BIOS_ERR, "ERROR: edp native read failure\n");
+			printk(BIOS_ERR, "edp native read failure\n");
 			return -1;
 		}
 
@@ -1384,7 +1384,7 @@ static int edp_ctrl_on(struct edp_ctrl *ctrl, struct edid *edid, uint8_t *dpcd)
 
 		ret = edp_aux_transfer(DP_SET_POWER, DP_AUX_NATIVE_WRITE, &value, 1);
 		if (ret < 0) {
-			printk(BIOS_ERR, "ERROR: edp native read failure\n");
+			printk(BIOS_ERR, "edp native read failure\n");
 			return -1;
 		}
 
@@ -1401,7 +1401,7 @@ static int edp_ctrl_on(struct edp_ctrl *ctrl, struct edid *edid, uint8_t *dpcd)
 	/* Start link training */
 	ret = edp_ctrl_training(ctrl, edid, dpcd);
 	if (ret != EDP_TRAIN_SUCCESS) {
-		printk(BIOS_ERR, "ERROR: edp training failure\n");
+		printk(BIOS_ERR, "edp training failure\n");
 		return -1;
 	}