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/soc/intel/braswell/pmutil.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/soc/intel/braswell/pmutil.c')

diff --git a/src/soc/intel/braswell/pmutil.c b/src/soc/intel/braswell/pmutil.c
index 4bc621b80e..18cb04dd89 100644
--- a/src/soc/intel/braswell/pmutil.c
+++ b/src/soc/intel/braswell/pmutil.c
@@ -17,7 +17,9 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <assert.h>
+#include <device/device.h>
 #include <device/mmio.h>
+#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <soc/iomap.h>
@@ -37,9 +39,7 @@ static inline pci_devfn_t get_pcu_dev(void)
 	return pcu_dev;
 }
 
-#else /* ENV_SMM */
-#include <device/device.h>
-#include <device/pci.h>
+#else /* __SIMPLE_DEVICE__ */
 
 static struct device *pcu_dev;
 static struct device *get_pcu_dev(void)
@@ -48,7 +48,7 @@ static struct device *get_pcu_dev(void)
 		pcu_dev = pcidev_on_root(PCU_DEV, 0);
 	return pcu_dev;
 }
-#endif /* ENV_SMM */
+#endif /* __SIMPLE_DEVICE__ */
 
 uint16_t get_pmbase(void)
 {
-- 
cgit v1.2.3