From a9caa50e8ac08338caf29c8452d624e316e07581 Mon Sep 17 00:00:00 2001 From: Frans Hendriks Date: Mon, 1 Feb 2021 11:44:37 +0100 Subject: device: correct code style Revise the following aspects to follow coreboot's coding style: - Drop braces for single-statement condition and loop bodies. - Use `__func__` to print the current function's name. - Reflow pointer dereferences to fit in a single line. - Adjust the `*` position in pointer variable declarations. - Drop unnecessary `else` statements. BUG = N/A TEST = Build Compulab Intense-PC with secure oprom enabled Change-Id: I780251d946d5bea97658476d61d25555ec768dfc Signed-off-by: Frans Hendriks Reviewed-on: https://review.coreboot.org/c/coreboot/+/49963 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/device/device.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/device/device.c') diff --git a/src/device/device.c b/src/device/device.c index ffdfeac22c..fe1ced5805 100644 --- a/src/device/device.c +++ b/src/device/device.c @@ -166,8 +166,8 @@ static void read_resources(struct bus *bus) if (!curdev->ops || !curdev->ops->read_resources) { if (curdev->path.type != DEVICE_PATH_APIC) - printk(BIOS_ERR, "%s missing read_resources\n", - dev_path(curdev)); + printk(BIOS_ERR, "%s missing %s\n", + dev_path(curdev), __func__); continue; } post_log_path(curdev); @@ -178,8 +178,8 @@ static void read_resources(struct bus *bus) read_resources(link); } post_log_clear(); - printk(BIOS_SPEW, "%s read_resources bus %d link: %d done\n", - dev_path(bus->dev), bus->secondary, bus->link_num); + printk(BIOS_SPEW, "%s %s bus %d link: %d done\n", + dev_path(bus->dev), __func__, bus->secondary, bus->link_num); } struct device *vga_pri = NULL; @@ -210,11 +210,10 @@ static void set_vga_bridge_bits(void) "A bridge on the path doesn't support 16-bit VGA decoding!"); } - if (dev->on_mainboard) { + if (dev->on_mainboard) vga_onboard = dev; - } else { + else vga = dev; - } /* It isn't safe to enable all VGA cards. */ dev->command &= ~(PCI_COMMAND_MEMORY | PCI_COMMAND_IO); @@ -269,8 +268,8 @@ void assign_resources(struct bus *bus) { struct device *curdev; - printk(BIOS_SPEW, "%s assign_resources, bus %d link: %d\n", - dev_path(bus->dev), bus->secondary, bus->link_num); + printk(BIOS_SPEW, "%s %s, bus %d link: %d\n", + dev_path(bus->dev), __func__, bus->secondary, bus->link_num); for (curdev = bus->children; curdev; curdev = curdev->sibling) { if (!curdev->enabled || !curdev->resource_list) @@ -285,8 +284,8 @@ void assign_resources(struct bus *bus) curdev->ops->set_resources(curdev); } post_log_clear(); - printk(BIOS_SPEW, "%s assign_resources, bus %d link: %d\n", - dev_path(bus->dev), bus->secondary, bus->link_num); + printk(BIOS_SPEW, "%s %s, bus %d link: %d\n", + dev_path(bus->dev), __func__, bus->secondary, bus->link_num); } /** -- cgit v1.2.3