From 38f19400f944524b77094ebe651bed0c7d56d4b6 Mon Sep 17 00:00:00 2001
From: Richard Spiegel <richard.spiegel@silverbackltd.com>
Date: Fri, 29 Sep 2017 11:39:46 -0700
Subject: [PATCH] soc/amd/stoneyridge/southbridge.c: Remove preprocessor #if

Replace #if and #endif with runtime <if (condition) {> and <}>

Code Files: southbridge.c
BUG=b:62200891

Change-Id: I69877bf301fa89781381e3eb8e6b4acd7e16b4b4
Signed-off-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Reviewed-on: https://review.coreboot.org/21770
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
 src/soc/amd/stoneyridge/southbridge.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/soc/amd/stoneyridge/southbridge.c b/src/soc/amd/stoneyridge/southbridge.c
index 1ca742f617..92a1defb94 100644
--- a/src/soc/amd/stoneyridge/southbridge.c
+++ b/src/soc/amd/stoneyridge/southbridge.c
@@ -28,9 +28,7 @@
 #include <soc/southbridge.h>
 #include <soc/smbus.h>
 #include <soc/smi.h>
-#if IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)
 #include <fchec.h>
-#endif
 
 
 int acpi_get_sleep_type(void)
@@ -98,12 +96,11 @@ void southbridge_init(void *chip_info)
 
 void southbridge_final(void *chip_info)
 {
-#if IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)
-	agesawrapper_fchecfancontrolservice();
-#if !IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE)
-	enable_imc_thermal_zone();
-#endif
-#endif
+	if (IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)) {
+		agesawrapper_fchecfancontrolservice();
+		if (!IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE))
+			enable_imc_thermal_zone();
+	}
 }
 
 /*