From e16c9df4542a40c176225e9db034e750eb957d5d Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sat, 29 Dec 2018 08:04:16 +0200 Subject: soc/intel: Fix bad uses of __SIMPLE_DEVICE__ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/30497 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/soc/intel/denverton_ns/romstage.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/soc/intel/denverton_ns/romstage.c') 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) { -- cgit v1.2.3