4 files changed, 4 insertions, 4 deletions
diff --git a/src/soc/intel/baytrail/spi.c b/src/soc/intel/baytrail/spi.c
index 81e118c4e6..497bfd5d73 100644
--- a/src/soc/intel/baytrail/spi.c
+++ b/src/soc/intel/baytrail/spi.c
@@ -264,7 +264,7 @@ static ich9_spi_regs *spi_regs(void)
 {
 	uint32_t sbase;
 
-#ifdef __SMM__
+#ifdef __SIMPLE_DEVICE__
 	pci_devfn_t dev = PCI_DEV(0, LPC_DEV, LPC_FUNC);
 #else
 	struct device *dev = pcidev_on_root(LPC_DEV, LPC_FUNC);
diff --git a/src/soc/intel/braswell/spi.c b/src/soc/intel/braswell/spi.c
index febf1d25b7..66eb53a8f3 100644
--- a/src/soc/intel/braswell/spi.c
+++ b/src/soc/intel/braswell/spi.c
@@ -232,7 +232,7 @@ static ich9_spi_regs *spi_regs(void)
 {
 	uint32_t sbase;
 
-#if ENV_SMM
+#ifdef __SIMPLE_DEVICE__
 	pci_devfn_t dev = PCI_DEV(0, LPC_DEV, LPC_FUNC);
 #else
 	struct device *dev = pcidev_on_root(LPC_DEV, LPC_FUNC);
diff --git a/src/soc/intel/fsp_baytrail/spi.c b/src/soc/intel/fsp_baytrail/spi.c
index 41d5150f4d..a9c0454c7f 100644
--- a/src/soc/intel/fsp_baytrail/spi.c
+++ b/src/soc/intel/fsp_baytrail/spi.c
@@ -253,7 +253,7 @@ static ich9_spi_regs *spi_regs(void)
 {
 	uint32_t sbase;
 
-#ifdef __SMM__
+#ifdef __SIMPLE_DEVICE__
 	pci_devfn_t dev = PCI_DEV(0, LPC_DEV, LPC_FUNC);
 #else
 	struct device *dev = pcidev_on_root(LPC_DEV, LPC_FUNC);
diff --git a/src/southbridge/intel/fsp_rangeley/spi.c b/src/southbridge/intel/fsp_rangeley/spi.c
index 1571925027..e10072a46c 100644
--- a/src/southbridge/intel/fsp_rangeley/spi.c
+++ b/src/southbridge/intel/fsp_rangeley/spi.c
@@ -344,7 +344,7 @@ void spi_init(void)
 	uint32_t ids;
 	uint16_t vendor_id, device_id;
 
-#ifdef __SMM__
+#ifdef __SIMPLE_DEVICE__
 	pci_devfn_t dev = PCI_DEV(0, 31, 0);
 #else
 	struct device *dev = pcidev_on_root(31, 0);