From 07841c2a2a930383dfd56d5adc966d0efaafec66 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sat, 17 Aug 2019 15:14:38 +0300 Subject: src/ec: Drop __PRE_RAM__ and __SMM__ guards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For files built in ramstage and smm -classes, testing for !__PRE_RAM__ is redundant. All chip_operations are exluded with use of DEVTREE_EARLY in static devicetree, so garbage collection will take care of the !__SMM__ cases. Change-Id: Id7219848d6f5c41c4a9724a72204fa5ef9458e43 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/34940 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/ec/quanta/ene_kb3940q/ec.c | 5 ----- src/ec/quanta/it8518/ec.c | 4 ---- 2 files changed, 9 deletions(-) (limited to 'src/ec/quanta') diff --git a/src/ec/quanta/ene_kb3940q/ec.c b/src/ec/quanta/ene_kb3940q/ec.c index 1f8e36c661..4fc38da99d 100644 --- a/src/ec/quanta/ene_kb3940q/ec.c +++ b/src/ec/quanta/ene_kb3940q/ec.c @@ -14,8 +14,6 @@ * GNU General Public License for more details. */ -#ifndef __PRE_RAM__ - #include #include #include @@ -125,7 +123,6 @@ void ec_mem_write(u8 addr, u8 data) return; } -#ifndef __SMM__ static void ene_kb3940q_log_events(void) { #if CONFIG(ELOG) @@ -165,5 +162,3 @@ struct chip_operations ec_quanta_ene_kb3940q_ops = { CHIP_NAME("QUANTA EnE KB3940Q EC") .enable_dev = enable_dev }; -#endif /* ! __SMM__ */ -#endif /* ! __PRE_RAM__ */ diff --git a/src/ec/quanta/it8518/ec.c b/src/ec/quanta/it8518/ec.c index 5b9ba9f9bd..4853eb333f 100644 --- a/src/ec/quanta/it8518/ec.c +++ b/src/ec/quanta/it8518/ec.c @@ -124,7 +124,6 @@ void ec_write(u16 addr, u8 data) ec_write_ib(data); } -#ifndef __PRE_RAM__ u8 ec_it8518_get_event(void) { @@ -149,7 +148,6 @@ void ec_it8518_enable_wake_events(void) ec_write(EC_WAKE_SRC_ENABLE, reg8 | EC_LID_WAKE_ENABLE); } -#ifndef __SMM__ static void it8518_init(struct device *dev) { if (!dev->enabled) @@ -178,5 +176,3 @@ struct chip_operations ec_quanta_it8518_ops = { CHIP_NAME("QUANTA IT8518 EC") .enable_dev = enable_dev }; -#endif /* ! __SMM__ */ -#endif /* ! __PRE_RAM__ */ -- cgit v1.2.3