[coreboot-gerrit] New patch to review for coreboot: southbridge/intel/ibexpeak: transition away from device_t

[Antonello Dettori (dev@dettori.io)]

Antonello Dettori (dev at dettori.io) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16408

-gerrit

commit 659653033b74339fac65b3eb511841bebccc8b36
Author: Antonello Dettori <dev at dettori.io>
Date:   Fri Sep 2 09:15:33 2016 +0200

    southbridge/intel/ibexpeak: transition away from device_t
    
    Replace the use of the old device_t definition inside
    southbridge/intel/ibexpeak.
    
    The patch has been tested both with the arch/io.h definition of device_t
    enabled and disabled in order to ensure compatibility while the
    transaction takes place.
    
    Change-Id: Ic569aada9301b37e73196872584e191d553acd86
    Signed-off-by: Antonello Dettori <dev at dettori.io>
---
 src/southbridge/intel/ibexpeak/early_smbus.c   | 2 +-
 src/southbridge/intel/ibexpeak/early_thermal.c | 2 +-
 src/southbridge/intel/ibexpeak/pch.h           | 2 +-
 src/southbridge/intel/ibexpeak/smihandler.c    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/southbridge/intel/ibexpeak/early_smbus.c b/src/southbridge/intel/ibexpeak/early_smbus.c
index 3d4c237..f3dab8d 100644
--- a/src/southbridge/intel/ibexpeak/early_smbus.c
+++ b/src/southbridge/intel/ibexpeak/early_smbus.c
@@ -23,7 +23,7 @@
 
 void enable_smbus(void)
 {
-	device_t dev;
+	pci_devfn_t dev;
 
 	/* Set the SMBus device statically. */
 	dev = PCI_DEV(0x0, 0x1f, 0x3);
diff --git a/src/southbridge/intel/ibexpeak/early_thermal.c b/src/southbridge/intel/ibexpeak/early_thermal.c
index eb25328..4e4860c 100644
--- a/src/southbridge/intel/ibexpeak/early_thermal.c
+++ b/src/southbridge/intel/ibexpeak/early_thermal.c
@@ -23,7 +23,7 @@
    which is done at the end of raminit.  */
 void early_thermal_init(void)
 {
-	device_t dev;
+	pci_devfn_t dev;
 	msr_t msr;
 
 	dev = PCI_DEV(0x0, 0x1f, 0x6);
diff --git a/src/southbridge/intel/ibexpeak/pch.h b/src/southbridge/intel/ibexpeak/pch.h
index 6c694fd..d87f8e0 100644
--- a/src/southbridge/intel/ibexpeak/pch.h
+++ b/src/southbridge/intel/ibexpeak/pch.h
@@ -61,7 +61,7 @@ void intel_pch_finalize_smm(void);
 
 #if !defined(__ASSEMBLER__)
 #if !defined(__PRE_RAM__)
-#if !defined(__SMM__)
+#if !defined(__SIMPLE_DEVICE__)
 #include "chip.h"
 void pch_enable(device_t dev);
 #endif
diff --git a/src/southbridge/intel/ibexpeak/smihandler.c b/src/southbridge/intel/ibexpeak/smihandler.c
index 0ad7e65..c3db159 100644
--- a/src/southbridge/intel/ibexpeak/smihandler.c
+++ b/src/southbridge/intel/ibexpeak/smihandler.c
@@ -280,7 +280,7 @@ static void busmaster_disable_on_bus(int bus)
 	for (slot = 0; slot < 0x20; slot++) {
 		for (func = 0; func < 8; func++) {
 			u32 reg32;
-			device_t dev = PCI_DEV(bus, slot, func);
+			pci_devfn_t dev = PCI_DEV(bus, slot, func);
 
 			val = pci_read_config32(dev, PCI_VENDOR_ID);