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

[Antonello Dettori]

Antonello Dettori ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16473

-gerrit

commit 4d4704d2273b92906902a477bd80b5dbdb9b75ec
Author: Antonello Dettori 
Date:   Sat Sep 3 10:45:33 2016 +0200

southbridge/amd/amd8111: transition away from device_t

Replace the use of the old device_t definition inside
    southbridge/amd/amd8111.

Change-Id: I76cdc32171b7ce819b53c534b3a5e57e9dd5f3dd
    Signed-off-by: Antonello Dettori 
---
 src/southbridge/amd/amd8111/amd8111.h     | 2 ++
 src/southbridge/amd/amd8111/early_ctrl.c  | 8 ++++----
 src/southbridge/amd/amd8111/early_smbus.c | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/southbridge/amd/amd8111/amd8111.h b/src/southbridge/amd/amd8111/amd8111.h
index e877f2a..10df590 100644
--- a/src/southbridge/amd/amd8111/amd8111.h
+++ b/src/southbridge/amd/amd8111/amd8111.h
@@ -3,7 +3,9 @@

#include "chip.h"

+#ifndef __SIMPLE_DEVICE__
 void amd8111_enable(device_t dev);
+#endif

#ifdef __PRE_RAM__
 void enable_fid_change_on_sb(unsigned sbbusn, unsigned sbdn);
diff --git a/src/southbridge/amd/amd8111/early_ctrl.c b/src/southbridge/amd/amd8111/early_ctrl.c
index d84ef18..15f3123 100644
--- a/src/southbridge/amd/amd8111/early_ctrl.c
+++ b/src/southbridge/amd/amd8111/early_ctrl.c
@@ -4,7 +4,7 @@
 /* by yhlu 2005.10 */
 static unsigned get_sbdn(unsigned bus)
 {
-	device_t dev;
+	pci_devfn_t dev;

/* Find the device.
     * There can only be one 8111 on a hypertransport chain/bus.
@@ -19,7 +19,7 @@ static unsigned get_sbdn(unsigned bus)

static void enable_cf9_x(unsigned sbbusn, unsigned sbdn)
 {
-	device_t dev;
+	pci_devfn_t dev;
    uint8_t byte;

dev = PCI_DEV(sbbusn, sbdn+1, 3); //ACPI
@@ -48,7 +48,7 @@ void hard_reset(void)

void enable_fid_change_on_sb(unsigned sbbusn, unsigned sbdn)
 {
-	device_t dev;
+	pci_devfn_t dev;

dev = PCI_DEV(sbbusn, sbdn+1, 3); // ACPI

@@ -61,7 +61,7 @@ void enable_fid_change_on_sb(unsigned sbbusn, unsigned sbdn)

static void soft_reset_x(unsigned sbbusn, unsigned sbdn)
 {
-	device_t dev;
+	pci_devfn_t dev;

dev = PCI_DEV(sbbusn, sbdn+1, 0); //ISA

diff --git a/src/southbridge/amd/amd8111/early_smbus.c b/src/southbridge/amd/amd8111/early_smbus.c
index aed4ebb..4c0ace5 100644
--- a/src/southbridge/amd/amd8111/early_smbus.c
+++ b/src/southbridge/amd/amd8111/early_smbus.c
@@ -4,7 +4,7 @@

static void enable_smbus(void)
 {
-	device_t dev;
+	pci_devfn_t dev;
    uint8_t enable;

dev = pci_locate_device(PCI_ID(0x1022, 0x746b), 0);