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/device/dram/ddr4.c | 2 +- src/device/dram/lpddr4.c | 2 +- src/device/oprom/realmode/x86.c | 2 +- src/device/pci_device.c | 7 +++---- src/device/pnp_device.c | 11 +++++------ 5 files changed, 11 insertions(+), 13 deletions(-) (limited to 'src/device') diff --git a/src/device/dram/ddr4.c b/src/device/dram/ddr4.c index eea5f0af56..a66ee86fd1 100644 --- a/src/device/dram/ddr4.c +++ b/src/device/dram/ddr4.c @@ -143,7 +143,7 @@ uint16_t ddr4_speed_mhz_to_reported_mts(uint16_t speed_mhz) return speed_attr->reported_mts; } } - printk(BIOS_ERR, "ERROR: DDR4 speed of %d MHz is out of range\n", speed_mhz); + printk(BIOS_ERR, "DDR4 speed of %d MHz is out of range\n", speed_mhz); return 0; } diff --git a/src/device/dram/lpddr4.c b/src/device/dram/lpddr4.c index a0c71f28a8..625aff295e 100644 --- a/src/device/dram/lpddr4.c +++ b/src/device/dram/lpddr4.c @@ -94,6 +94,6 @@ uint16_t lpddr4_speed_mhz_to_reported_mts(uint16_t speed_mhz) return speed_attr->reported_mts; } } - printk(BIOS_ERR, "ERROR: LPDDR4 speed of %d MHz is out of range\n", speed_mhz); + printk(BIOS_ERR, "LPDDR4 speed of %d MHz is out of range\n", speed_mhz); return 0; } diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c index b391b92ee0..7972011a3f 100644 --- a/src/device/oprom/realmode/x86.c +++ b/src/device/oprom/realmode/x86.c @@ -233,7 +233,7 @@ static u8 vbe_get_ctrl_info(vbe_info_block *info) 0x0000, buffer_seg, buffer_adr); /* If the VBE function completed successfully, 0x0 is returned in AH */ if (X86_AH) { - printk(BIOS_WARNING, "Warning: Error from VGA BIOS in %s\n", __func__); + printk(BIOS_WARNING, "Error from VGA BIOS in %s\n", __func__); return 1; } memcpy(info, buffer, sizeof(vbe_info_block)); diff --git a/src/device/pci_device.c b/src/device/pci_device.c index ed95dff953..5938f0de83 100644 --- a/src/device/pci_device.c +++ b/src/device/pci_device.c @@ -497,7 +497,7 @@ static void pci_store_bridge_resource(const struct device *const dev, } else { /* Don't let me think I stored the resource. */ resource->flags &= ~IORESOURCE_STORED; - printk(BIOS_ERR, "ERROR: invalid resource->index %lx\n", resource->index); + printk(BIOS_ERR, "invalid resource->index %lx\n", resource->index); } } @@ -510,7 +510,7 @@ static void pci_set_resource(struct device *dev, struct resource *resource) we can treat it like an empty resource. */ resource->size = 0; } else { - printk(BIOS_ERR, "ERROR: %s %02lx %s size: 0x%010llx not assigned\n", + printk(BIOS_ERR, "%s %02lx %s size: 0x%010llx not assigned\n", dev_path(dev), resource->index, resource_type(resource), resource->size); return; @@ -1617,8 +1617,7 @@ int get_pci_irq_pins(struct device *dev, struct device **parent_bdg) /* Make sure the swizzle returned valid structures */ if (parent_bdg == NULL) { - printk(BIOS_WARNING, - "Warning: Could not find parent bridge for this device!\n"); + printk(BIOS_WARNING, "Could not find parent bridge for this device!\n"); return -2; } } else { /* Device is not behind a bridge */ diff --git a/src/device/pnp_device.c b/src/device/pnp_device.c index 88072b9a77..85daec7fc5 100644 --- a/src/device/pnp_device.c +++ b/src/device/pnp_device.c @@ -126,12 +126,12 @@ static void pnp_set_resource(struct device *dev, struct resource *resource) if (resource->flags & IORESOURCE_IRQ && (resource->index != PNP_IDX_IRQ0) && (resource->index != PNP_IDX_IRQ1)) - printk(BIOS_WARNING, "WARNING: %s %02lx %s size: " + printk(BIOS_WARNING, "%s %02lx %s size: " "0x%010llx not assigned in devicetree\n", dev_path(dev), resource->index, resource_type(resource), resource->size); else - printk(BIOS_ERR, "ERROR: %s %02lx %s size: 0x%010llx " + printk(BIOS_ERR, "%s %02lx %s size: 0x%010llx " "not assigned in devicetree\n", dev_path(dev), resource->index, resource_type(resource), resource->size); return; @@ -145,7 +145,7 @@ static void pnp_set_resource(struct device *dev, struct resource *resource) } else if (resource->flags & IORESOURCE_IRQ) { pnp_set_irq(dev, resource->index, resource->base); } else { - printk(BIOS_ERR, "ERROR: %s %02lx unknown resource type\n", + printk(BIOS_ERR, "%s %02lx unknown resource type\n", dev_path(dev), resource->index); return; } @@ -213,7 +213,7 @@ static void pnp_get_ioresource(struct device *dev, u8 index, u16 mask) /* If none of the mask bits is set, the resource would occupy the whole IO space leading to IO resource conflicts with the other devices */ if (!mask) { - printk(BIOS_ERR, "ERROR: device %s index %d has no mask.\n", + printk(BIOS_ERR, "device %s index %d has no mask.\n", dev_path(dev), index); return; } @@ -241,8 +241,7 @@ static void pnp_get_ioresource(struct device *dev, u8 index, u16 mask) If there is any zero in between the block of ones, it is ignored in the calculation of the resource size and limit. */ if (mask != (resource->limit ^ (resource->size - 1))) - printk(BIOS_WARNING, - "WARNING: mask of device %s index %d is wrong.\n", + printk(BIOS_WARNING, "mask of device %s index %d is wrong.\n", dev_path(dev), index); } -- cgit v1.2.3