From 8126daf6f36c2c99edd3f39fa003a53f8fa0d63f Mon Sep 17 00:00:00 2001
From: Antonello Dettori <dev@dettori.io>
Date: Sat, 3 Sep 2016 10:45:33 +0200
Subject: southbridge/nvidia/mcp55: transition away from device_t
Replace the use of the old device_t definition inside
southbridge/nvidia/mcp55.
Change-Id: I98ac468940eaf6c456fa95540ec3e718edfe26a7
Signed-off-by: Antonello Dettori <dev@dettori.io>
Reviewed-on: https://review.coreboot.org/16487
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
---
src/southbridge/nvidia/mcp55/early_ctrl.c | 2 +-
src/southbridge/nvidia/mcp55/early_setup_car.c | 4 ++--
src/southbridge/nvidia/mcp55/early_smbus.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/southbridge/nvidia/mcp55/early_ctrl.c b/src/southbridge/nvidia/mcp55/early_ctrl.c
index 5e5c53594c..5e75adf5bd 100644
--- a/src/southbridge/nvidia/mcp55/early_ctrl.c
+++ b/src/southbridge/nvidia/mcp55/early_ctrl.c
@@ -20,7 +20,7 @@
static unsigned get_sbdn(unsigned bus)
{
- device_t dev;
+ pci_devfn_t dev;
/* Find the device. */
dev = pci_locate_device_on_bus(PCI_ID(PCI_VENDOR_ID_NVIDIA,
diff --git a/src/southbridge/nvidia/mcp55/early_setup_car.c b/src/southbridge/nvidia/mcp55/early_setup_car.c
index 619ba4cc90..76947ec18d 100644
--- a/src/southbridge/nvidia/mcp55/early_setup_car.c
+++ b/src/southbridge/nvidia/mcp55/early_setup_car.c
@@ -112,7 +112,7 @@ static void mcp55_early_pcie_setup(unsigned busnx, unsigned devnx,
{
u32 tgio_ctrl, pll_ctrl, dword;
int i;
- device_t dev;
+ pci_devfn_t dev;
dev = PCI_DEV(busnx, devnx + 1, 1);
@@ -378,7 +378,7 @@ static int mcp55_early_setup_x(void)
busnx = ht_c_index * HT_CHAIN_BUSN_D;
for (devnx = 0; devnx < 0x20; devnx++) {
u32 id;
- device_t dev;
+ pci_devfn_t dev;
dev = PCI_DEV(busnx, devnx, 0);
id = pci_read_config32(dev, PCI_VENDOR_ID);
if (id == 0x036910de) {
diff --git a/src/southbridge/nvidia/mcp55/early_smbus.c b/src/southbridge/nvidia/mcp55/early_smbus.c
index 349461aa1d..595914af2d 100644
--- a/src/southbridge/nvidia/mcp55/early_smbus.c
+++ b/src/southbridge/nvidia/mcp55/early_smbus.c
@@ -25,7 +25,7 @@
static void enable_smbus(void)
{
- device_t dev;
+ pci_devfn_t dev;
dev = pci_locate_device(PCI_ID(0x10de, 0x0368), 0);
if (dev == PCI_DEV_INVALID)
--
cgit v1.2.3