soc/intel: Fix bad uses of __SIMPLE_DEVICE__

Cases of *dev = PCI_DEV(b,d,f) are invalid. Not caught
because files only build with __SIMPLE_DEVICE__ defined.

Remove cases of testing __SIMPLE_DEVICE__ in files that
are not build for ramstage.

Change-Id: If10a0efa187c9b1d9a5577008aa46f050f0aa309
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30497
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

6 files changed, 3 insertions, 34 deletions

diff --git a/src/soc/intel/broadwell/smihandler.c b/src/soc/intel/broadwell/smihandler.c
index 64a315d30e..777c0d20a1 100644
--- a/src/soc/intel/broadwell/smihandler.c
+++ b/src/soc/intel/broadwell/smihandler.c
@@ -80,12 +80,8 @@ static void busmaster_disable_on_bus(int bus)
 	for (slot = 0; slot < 0x20; slot++) {
 		for (func = 0; func < 8; func++) {
 			u32 reg32;
-#if defined(__SIMPLE_DEVICE__)
-			pci_devfn_t dev = PCI_DEV(bus, slot, func);
-#else
-			struct device *dev = PCI_DEV(bus, slot, func);
-#endif
 
+			pci_devfn_t dev = PCI_DEV(bus, slot, func);
 			val = pci_read_config32(dev, PCI_VENDOR_ID);
 
 			if (val == 0xffffffff || val == 0x00000000 ||
diff --git a/src/soc/intel/common/block/lpc/lpc_lib.c b/src/soc/intel/common/block/lpc/lpc_lib.c
index bcbd8e6cbd..2fe5b39c0a 100644
--- a/src/soc/intel/common/block/lpc/lpc_lib.c
+++ b/src/soc/intel/common/block/lpc/lpc_lib.c
@@ -167,11 +167,7 @@ bool lpc_fits_fixed_mmio_window(uintptr_t base, size_t size)
  */
 static void lpc_set_bios_control_reg(uint8_t bios_cntl_bit)
 {
-#if defined(__SIMPLE_DEVICE__)
 	pci_devfn_t dev = PCH_DEV_LPC;
-#else
-	struct device *dev = PCH_DEV_LPC;
-#endif
 	uint8_t bc_cntl;
 
 	assert(IS_POWER_OF_2(bios_cntl_bit));
@@ -214,11 +210,7 @@ void lpc_set_eiss(void)
 */
 void lpc_set_serirq_mode(enum serirq_mode mode)
 {
-#if defined(__SIMPLE_DEVICE__)
 	pci_devfn_t dev = PCH_DEV_LPC;
-#else
-	struct device *dev = PCH_DEV_LPC;
-#endif
 	uint8_t scnt;
 
 	scnt = pci_read_config8(dev, LPC_SERIRQ_CTL);
diff --git a/src/soc/intel/common/block/smm/smihandler.c b/src/soc/intel/common/block/smm/smihandler.c
index 2ffc00f9d0..538028d76a 100644
--- a/src/soc/intel/common/block/smm/smihandler.c
+++ b/src/soc/intel/common/block/smm/smihandler.c
@@ -134,11 +134,8 @@ static void busmaster_disable_on_bus(int bus)
 	for (slot = 0; slot < 0x20; slot++) {
 		for (func = 0; func < 8; func++) {
 			u32 reg32;
-#if defined(__SIMPLE_DEVICE__)
+
 			pci_devfn_t dev = PCI_DEV(bus, slot, func);
-#else
-			struct device *dev = PCI_DEV(bus, slot, func);
-#endif
 
 			if (!smihandler_soc_disable_busmaster(dev))
 				continue;
diff --git a/src/soc/intel/denverton_ns/bootblock/uart.c b/src/soc/intel/denverton_ns/bootblock/uart.c
index 7d97661bfb..8af6b3928b 100644
--- a/src/soc/intel/denverton_ns/bootblock/uart.c
+++ b/src/soc/intel/denverton_ns/bootblock/uart.c
@@ -31,11 +31,7 @@ static void pci_early_hsuart_device_probe(u8 bus, u8 dev, u8 func,
 					  u32 mmio_base)
 {
 	register uint16_t reg16;
-#if defined(__SIMPLE_DEVICE__)
 	pci_devfn_t uart_dev = PCI_DEV(bus, dev, func);
-#else
-	struct device *uart_dev = PCI_DEV(bus, dev, func);
-#endif
 
 	/* We're using MMIO for HSUARTs. This section is needed for logging
 	*  from FSP only
diff --git a/src/soc/intel/denverton_ns/romstage.c b/src/soc/intel/denverton_ns/romstage.c
index 617b64a619..34fd7bbd25 100644
--- a/src/soc/intel/denverton_ns/romstage.c
+++ b/src/soc/intel/denverton_ns/romstage.c
@@ -49,11 +49,7 @@ static void display_fsp_smbios_memory_info_hob(void)
 static void early_pmc_init(void)
 {
 	/* PMC (B0:D31:F2). */
-#if defined(__SIMPLE_DEVICE__)
 	pci_devfn_t dev = PCH_PMC_DEV;
-#else
-	struct device *dev = PCH_PMC_DEV;
-#endif
 
 	/* Is PMC present */
 	if (pci_read_config16(dev, 0) == 0xffff) {
@@ -102,11 +98,7 @@ static void early_pmc_init(void)
 static void early_tco_init(void)
 {
 	/* SMBUS (B0:D31:F4). */
-#if defined(__SIMPLE_DEVICE__)
 	pci_devfn_t dev = PCI_DEV(0, SMBUS_DEV, SMBUS_FUNC);
-#else
-	struct device *dev = PCI_DEV(0, SMBUS_DEV, SMBUS_FUNC);
-#endif
 
 	/* Configure TCO base address */
 	if (pci_read_config16(dev, TCOBASE) == 0xffff) {
diff --git a/src/soc/intel/denverton_ns/smihandler.c b/src/soc/intel/denverton_ns/smihandler.c
index d97bc24f59..85f99d7966 100644
--- a/src/soc/intel/denverton_ns/smihandler.c
+++ b/src/soc/intel/denverton_ns/smihandler.c
@@ -65,12 +65,8 @@ static void busmaster_disable_on_bus(int bus)
 	for (slot = 0; slot < 0x20; slot++) {
 		for (func = 0; func < 8; func++) {
 			u32 reg32;
-#if defined(__SIMPLE_DEVICE__)
-			pci_devfn_t dev = PCI_DEV(bus, slot, func);
-#else
-			struct device *dev = PCI_DEV(bus, slot, func);
-#endif
 
+			pci_devfn_t dev = PCI_DEV(bus, slot, func);
 			val = pci_read_config32(dev, PCI_VENDOR_ID);
 
 			if (val == 0xffffffff || val == 0x00000000 ||