[coreboot-gerrit] Change in coreboot[master]: soc/intel/skylake/pmutil.c: Define __SIMPLE_DEVICE__

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/50930 )

Change subject: soc/intel/skylake/pmutil.c: Define __SIMPLE_DEVICE__
......................................................................

soc/intel/skylake/pmutil.c: Define __SIMPLE_DEVICE__

Change-Id: I01035ad88dc6ba702fde2c58aa0093214a57e482
Signed-off-by: Angel Pons 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50930
Reviewed-by: Arthur Heymans 
Tested-by: build bot (Jenkins) 
---
M src/soc/intel/skylake/pmutil.c
1 file changed, 4 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Arthur Heymans: Looks good to me, approved

diff --git a/src/soc/intel/skylake/pmutil.c b/src/soc/intel/skylake/pmutil.c
index ec960b5..6d16f52 100644
--- a/src/soc/intel/skylake/pmutil.c
+++ b/src/soc/intel/skylake/pmutil.c
@@ -5,6 +5,8 @@
  * and the differences between PCH variants.
  */

+#define __SIMPLE_DEVICE__
+
 #include <acpi/acpi.h>
 #include <device/mmio.h>
 #include <device/pci_ops.h>
@@ -183,11 +185,8 @@
    u8 reg8;
    int rtc_failed;
    /* PMC Controller Device 0x1F, Func 02 */
-#if defined(__SIMPLE_DEVICE__)
-	pci_devfn_t dev = PCH_DEV_PMC;
-#else
-	struct device *dev = PCH_DEV_PMC;
-#endif
+	const pci_devfn_t dev = PCH_DEV_PMC;
+
    reg8 = pci_read_config8(dev, GEN_PMCON_B);
    rtc_failed = reg8 & RTC_BATTERY_DEAD;
    if (rtc_failed) {