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/drivers/vpd/vpd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/drivers/vpd') diff --git a/src/drivers/vpd/vpd.c b/src/drivers/vpd/vpd.c index a099b3be37..396097c9d9 100644 --- a/src/drivers/vpd/vpd.c +++ b/src/drivers/vpd/vpd.c @@ -67,7 +67,7 @@ static void init_vpd_rdev(const char *fmap_name, struct region_device *rdev) /* Try if we can find a google_vpd_info, otherwise read whole VPD. */ if (rdev_readat(rdev, &info, 0, sizeof(info)) != sizeof(info)) { - printk(BIOS_ERR, "ERROR: Failed to read %s header.\n", + printk(BIOS_ERR, "Failed to read %s header.\n", fmap_name); goto fail; } @@ -75,13 +75,13 @@ static void init_vpd_rdev(const char *fmap_name, struct region_device *rdev) if (memcmp(info.header.magic, VPD_INFO_MAGIC, sizeof(info.header.magic)) == 0) { if (rdev_chain(rdev, rdev, sizeof(info), info.size)) { - printk(BIOS_ERR, "ERROR: %s info size too large.\n", + printk(BIOS_ERR, "%s info size too large.\n", fmap_name); goto fail; } } else if (info.header.tlv.type == VPD_TYPE_TERMINATOR || info.header.tlv.type == VPD_TYPE_IMPLICIT_TERMINATOR) { - printk(BIOS_WARNING, "WARNING: %s is uninitialized or empty.\n", + printk(BIOS_WARNING, "%s is uninitialized or empty.\n", fmap_name); goto fail; } @@ -151,7 +151,7 @@ static void cbmem_add_cros_vpd(int is_recovery) if (ro_size) { if (rdev_readat(&ro_vpd, cbmem->blob, 0, ro_size) != ro_size) { - printk(BIOS_ERR, "ERROR: Couldn't read RO VPD\n"); + printk(BIOS_ERR, "Couldn't read RO VPD\n"); cbmem->ro_size = ro_size = 0; } timestamp_add_now(TS_END_COPYVPD_RO); @@ -160,7 +160,7 @@ static void cbmem_add_cros_vpd(int is_recovery) if (rw_size) { if (rdev_readat(&rw_vpd, cbmem->blob + ro_size, 0, rw_size) != rw_size) { - printk(BIOS_ERR, "ERROR: Couldn't read RW VPD\n"); + printk(BIOS_ERR, "Couldn't read RW VPD\n"); cbmem->rw_size = rw_size = 0; } timestamp_add_now(TS_END_COPYVPD_RW); -- cgit v1.2.3