[coreboot-gerrit] Change in coreboot[master]: nb/via/vx900: Remove some __SIMPLE_DEVICE__ use

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35647 )

Change subject: nb/via/vx900: Remove some __SIMPLE_DEVICE__ use
......................................................................

nb/via/vx900: Remove some __SIMPLE_DEVICE__ use

Change-Id: I840131f91e79c740c0c8784c252723ae90ded458
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35647
Tested-by: build bot (Jenkins) 
Reviewed-by: Aaron Durbin 
---
M src/northbridge/via/vx900/chrome9hd.c
M src/northbridge/via/vx900/lpc.c
M src/northbridge/via/vx900/pci_util.c
M src/northbridge/via/vx900/vx900.h
4 files changed, 3 insertions(+), 11 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Aaron Durbin: Looks good to me, approved

diff --git a/src/northbridge/via/vx900/chrome9hd.c b/src/northbridge/via/vx900/chrome9hd.c
index 163f6b1..fef5350 100644
--- a/src/northbridge/via/vx900/chrome9hd.c
+++ b/src/northbridge/via/vx900/chrome9hd.c
@@ -240,7 +240,7 @@

printk(BIOS_DEBUG, "Enable VGA console\n");

-	dump_pci_device(dev);
+	dump_pci_device(PCI_BDF(dev));
 }

static void chrome9hd_enable(struct device *dev)
diff --git a/src/northbridge/via/vx900/lpc.c b/src/northbridge/via/vx900/lpc.c
index 41ea154..cab783e 100644
--- a/src/northbridge/via/vx900/lpc.c
+++ b/src/northbridge/via/vx900/lpc.c
@@ -180,7 +180,7 @@
 {
    vx900_lpc_interrupt_stuff(dev);
    vx900_lpc_misc_stuff(dev);
-	dump_pci_device(dev);
+	dump_pci_device(PCI_BDF(dev));
 }

static void vx900_lpc_read_resources(struct device *dev)
diff --git a/src/northbridge/via/vx900/pci_util.c b/src/northbridge/via/vx900/pci_util.c
index e6eb91a..57b08e7 100644
--- a/src/northbridge/via/vx900/pci_util.c
+++ b/src/northbridge/via/vx900/pci_util.c
@@ -19,11 +19,7 @@

#include "vx900.h"

-#ifdef __SIMPLE_DEVICE__
 void dump_pci_device(pci_devfn_t dev)
-#else
-void dump_pci_device(struct device *dev)
-#endif
 {
    int i;
    for (i = 0; i <= 0xff; i++) {
@@ -34,7 +30,7 @@
    	if ((i & 0x0f) == 0x08)
    		printk(BIOS_DEBUG, " |");

-		val = pci_read_config8(dev, i);
+		val = pci_s_read_config8(dev, i);
    	printk(BIOS_DEBUG, " %.2x", val);

if ((i & 0x0f) == 0x0f)
diff --git a/src/northbridge/via/vx900/vx900.h b/src/northbridge/via/vx900/vx900.h
index 96d821a..1f61153 100644
--- a/src/northbridge/via/vx900/vx900.h
+++ b/src/northbridge/via/vx900/vx900.h
@@ -39,10 +39,6 @@
 /* We use these throughout the code. They really belong in a generic part of
  * coreboot, but until bureaucracy gets them there, we still need them  */

-#ifdef __SIMPLE_DEVICE__
 void dump_pci_device(pci_devfn_t dev);
-#else
-void dump_pci_device(struct device *dev);
-#endif

#endif				/* __VX900_H */