diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-09-27 16:54:44 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-09-28 21:16:02 +0000 |
| commit | f485d91141950dbb094d167f7f57118f5564fa22 (patch) | |
| tree | a10b75df74b58747701172c70dbfa72e329190ed | |
| parent | 13ad74070165d2d48f8546f9dd9da7e354e5ee4a (diff) | |
| download | coreboot-f485d91141950dbb094d167f7f57118f5564fa22.tar.xz | |
nb/via/vx900: Remove some __SIMPLE_DEVICE__ use
Change-Id: I840131f91e79c740c0c8784c252723ae90ded458
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35647
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
| -rw-r--r-- | src/northbridge/via/vx900/chrome9hd.c | 2 | ||||
| -rw-r--r-- | src/northbridge/via/vx900/lpc.c | 2 | ||||
| -rw-r--r-- | src/northbridge/via/vx900/pci_util.c | 6 | ||||
| -rw-r--r-- | src/northbridge/via/vx900/vx900.h | 4 |
4 files changed, 3 insertions, 11 deletions
diff --git a/src/northbridge/via/vx900/chrome9hd.c b/src/northbridge/via/vx900/chrome9hd.c index 163f6b1da0..fef53502f8 100644 --- a/src/northbridge/via/vx900/chrome9hd.c +++ b/src/northbridge/via/vx900/chrome9hd.c @@ -240,7 +240,7 @@ static void chrome9hd_init(struct device *dev) 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 41ea1545cf..cab783e5ba 100644 --- a/src/northbridge/via/vx900/lpc.c +++ b/src/northbridge/via/vx900/lpc.c @@ -180,7 +180,7 @@ static void vx900_lpc_init(struct device *dev) { 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 e6eb91ac95..57b08e7586 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 @@ void dump_pci_device(struct device *dev) 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 96d821ac4d..1f611535aa 100644 --- a/src/northbridge/via/vx900/vx900.h +++ b/src/northbridge/via/vx900/vx900.h @@ -39,10 +39,6 @@ uint64_t get_uma_memory_base(void); /* 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 */ |