From 6b2e4369956eb3edd0982bc848db712c107c9a23 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Mon, 11 Mar 2019 22:27:22 +0100 Subject: [PATCH] nb/amd/amdfam10: Remove 'IS_ENABLED()' Change-Id: Ia1fe691e3a5fb861afb6bf7b01a9ff23ec37858f Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/coreboot/+/31810 Reviewed-by: Julius Werner Tested-by: build bot (Jenkins) --- .../amd/amdfam10/setup_resource_map.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/northbridge/amd/amdfam10/setup_resource_map.c b/src/northbridge/amd/amdfam10/setup_resource_map.c index de2eeacd06..3e6a437934 100644 --- a/src/northbridge/amd/amdfam10/setup_resource_map.c +++ b/src/northbridge/amd/amdfam10/setup_resource_map.c @@ -63,11 +63,11 @@ void setup_resource_map_x_offset(const u32 *register_values, u32 max, u32 offset { u32 i; - if (IS_ENABLED(RES_DEBUG)) + if (RES_DEBUG) printk(BIOS_DEBUG, "setting up resource map ex offset....\n"); for (i = 0; i < max; i += 4) { - if (IS_ENABLED(RES_DEBUG)) + if (RES_DEBUG) printk(BIOS_DEBUG, "%04x: %02x %08x <- & %08x | %08x\n", i/4, register_values[i], register_values[i+1] + ((register_values[i]==RES_PCI_IO) ? offset_pci_dev : 0), @@ -83,12 +83,12 @@ void setup_resource_map_x_offset(const u32 *register_values, u32 max, u32 offset dev = (register_values[i+1] & ~0xfff) + offset_pci_dev; where = register_values[i+1] & 0xfff; reg = pci_read_config32(dev, where); - if (IS_ENABLED(RES_DEBUG)) + if (RES_DEBUG) printk(BIOS_SPEW, "WAS: %08x\n", reg); reg &= register_values[i+2]; reg |= register_values[i+3]; pci_write_config32(dev, where, reg); - if (IS_ENABLED(RES_DEBUG)) + if (RES_DEBUG) printk(BIOS_SPEW, "NOW: %08x\n", reg); } break; @@ -98,12 +98,12 @@ void setup_resource_map_x_offset(const u32 *register_values, u32 max, u32 offset u32 reg; where = register_values[i+1] + offset_io_base; reg = inb(where); - if (IS_ENABLED(RES_DEBUG)) + if (RES_DEBUG) printk(BIOS_SPEW, "WAS: %08x\n", reg); reg &= register_values[i+2]; reg |= register_values[i+3]; outb(reg, where); - if (IS_ENABLED(RES_DEBUG)) + if (RES_DEBUG) printk(BIOS_SPEW, "NOW: %08x\n", reg); } break; @@ -113,19 +113,19 @@ void setup_resource_map_x_offset(const u32 *register_values, u32 max, u32 offset u32 reg; where = register_values[i+1] + offset_io_base; reg = inl(where); - if (IS_ENABLED(RES_DEBUG)) + if (RES_DEBUG) printk(BIOS_SPEW, "WAS: %08x\n", reg); reg &= register_values[i+2]; reg |= register_values[i+3]; outl(reg, where); - if (IS_ENABLED(RES_DEBUG)) + if (RES_DEBUG) printk(BIOS_SPEW, "NOW: %08x\n", reg); } break; } } - if (IS_ENABLED(RES_DEBUG)) + if (RES_DEBUG) printk(BIOS_DEBUG, "done.\n"); } @@ -133,11 +133,11 @@ void setup_resource_map_x(const u32 *register_values, u32 max) { u32 i; - if (IS_ENABLED(RES_DEBUG)) + if (RES_DEBUG) printk(BIOS_DEBUG, "setting up resource map ex offset....\n"); for (i = 0; i < max; i += 4) { - if (IS_ENABLED(RES_DEBUG)) + if (RES_DEBUG) printk(BIOS_DEBUG, "%04x: %02x %08x <- & %08x | %08x\n", i/4, register_values[i],register_values[i+1], register_values[i+2], register_values[i+3]); switch (register_values[i]) { @@ -179,6 +179,6 @@ void setup_resource_map_x(const u32 *register_values, u32 max) } } - if (IS_ENABLED(RES_DEBUG)) + if (RES_DEBUG) printk(BIOS_DEBUG, "done.\n"); }