[coreboot-gerrit] Change in ...coreboot[master]: intel/spi: Fix use of __SIMPLE_DEVICE__

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31629

Change subject: intel/spi: Fix use of __SIMPLE_DEVICE__
......................................................................

intel/spi: Fix use of __SIMPLE_DEVICE__

Fix cases of using ENV_SMM where __SIMPLE_DEVICE__
should be used instead.

Change-Id: I385c82767a87ff7a47466a200488fae9fc8b863d
Signed-off-by: Kyösti Mälkki 
---
M src/soc/intel/baytrail/spi.c
M src/soc/intel/braswell/spi.c
M src/soc/intel/fsp_baytrail/spi.c
M src/southbridge/intel/fsp_rangeley/spi.c
4 files changed, 4 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/31629/1

diff --git a/src/soc/intel/baytrail/spi.c b/src/soc/intel/baytrail/spi.c
index 651126f..f7472b9 100644
--- a/src/soc/intel/baytrail/spi.c
+++ b/src/soc/intel/baytrail/spi.c
@@ -236,7 +236,7 @@
 {
    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 47100ab..14d1087 100644
--- a/src/soc/intel/braswell/spi.c
+++ b/src/soc/intel/braswell/spi.c
@@ -204,7 +204,7 @@
 {
    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 2b7bf50..275b038 100644
--- a/src/soc/intel/fsp_baytrail/spi.c
+++ b/src/soc/intel/fsp_baytrail/spi.c
@@ -225,7 +225,7 @@
 {
    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 c9edd59..227422b 100644
--- a/src/southbridge/intel/fsp_rangeley/spi.c
+++ b/src/southbridge/intel/fsp_rangeley/spi.c
@@ -316,7 +316,7 @@
    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);