From 21d6a27ac07d5233a7dd473d84c4c0b541059146 Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Tue, 5 Nov 2019 18:50:38 +0200
Subject: arch/x86: Replace some __SMM__ guards
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We generally do not guard source in attempts to reduce
the final object sizes, but rely on garbage collection.

Most of the __unused attributes inserted here will be
removed when remaining __SIMPLE_DEVICE__ guards can
be removed.

Change-Id: I2440931fab4f41d7e8249c082e6c9b5a9cd0ef13
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36641
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/google/stout/ec.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src/mainboard/google/stout/ec.c')

diff --git a/src/mainboard/google/stout/ec.c b/src/mainboard/google/stout/ec.c
index 59987a156d..0ea32bcfc3 100644
--- a/src/mainboard/google/stout/ec.c
+++ b/src/mainboard/google/stout/ec.c
@@ -17,6 +17,7 @@
 #include <bootmode.h>
 #include <types.h>
 #include <console/console.h>
+#include <cpu/x86/smm.h>
 #include <ec/quanta/it8518/ec.h>
 #include <device/device.h>
 #include <device/pci.h>
@@ -25,11 +26,6 @@
 #include <elog.h>
 #include "ec.h"
 
-#ifdef __SMM__
-#include <cpu/x86/smm.h>
-#endif
-
-#ifndef __SMM__
 void stout_ec_init(void)
 {
 
@@ -59,8 +55,6 @@ void stout_ec_init(void)
 	// TODO: Power Limit Setting
 }
 
-#else // SMM
-
 void stout_ec_finalize_smm(void)
 {
 	u8 ec_reg, critical_shutdown = 0;
@@ -105,4 +99,3 @@ void stout_ec_finalize_smm(void)
 		write_pmbase32(PM1_CNT, read_pmbase32(PM1_CNT) | (0xf << 10));
 	}
 }
-#endif //__SMM__
-- 
cgit v1.2.3