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

[Nico Huber (Code Review)]

Nico Huber has submitted this change and it was merged. ( 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 
Reviewed-on: https://review.coreboot.org/c/31629
Tested-by: build bot (Jenkins) 
Reviewed-by: Nico Huber 
Reviewed-by: Matt DeVillier 
---
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(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved
  Matt DeVillier: Looks good to me, but someone else must approve

diff --git a/src/soc/intel/baytrail/spi.c b/src/soc/intel/baytrail/spi.c
index 81e118c..497bfd5 100644
--- a/src/soc/intel/baytrail/spi.c
+++ b/src/soc/intel/baytrail/spi.c
@@ -264,7 +264,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 febf1d2..66eb53a 100644
--- a/src/soc/intel/braswell/spi.c
+++ b/src/soc/intel/braswell/spi.c
@@ -232,7 +232,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 41d5150..a9c0454 100644
--- a/src/soc/intel/fsp_baytrail/spi.c
+++ b/src/soc/intel/fsp_baytrail/spi.c
@@ -253,7 +253,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 1571925..e10072a 100644
--- a/src/southbridge/intel/fsp_rangeley/spi.c
+++ b/src/southbridge/intel/fsp_rangeley/spi.c
@@ -344,7 +344,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);