From a144e4d6fa93b9ba129b3aa8991cc5fb2ec3c8a6 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Wed, 23 May 2018 20:00:16 +0300 Subject: device: Use pcidev_path_behind() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iac16f9412d0e6aac908d873c61a4de3935e5318a Signed-off-by: Kyösti Mälkki Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/26518 Reviewed-by: Felix Held Tested-by: build bot (Jenkins) --- src/southbridge/broadcom/bcm5785/bcm5785.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/southbridge/broadcom') diff --git a/src/southbridge/broadcom/bcm5785/bcm5785.c b/src/southbridge/broadcom/bcm5785/bcm5785.c index 16f45bb671..53ee8d4698 100644 --- a/src/southbridge/broadcom/bcm5785/bcm5785.c +++ b/src/southbridge/broadcom/bcm5785/bcm5785.c @@ -32,14 +32,15 @@ void bcm5785_enable(struct device *dev) { unsigned devfn; devfn = bus_dev->path.pci.devfn + (1 << 3); - sb_pci_main_dev = dev_find_slot(bus_dev->bus->secondary, devfn); + sb_pci_main_dev = pcidev_path_behind(bus_dev->bus, devfn); // index = ((dev->path.pci.devfn & ~7) >> 3) + 8; } else if ((bus_dev->vendor == PCI_VENDOR_ID_SERVERWORKS) && (bus_dev->device == 0x0104)) // device under PCI Bridge (under PCI-X) { unsigned devfn; devfn = bus_dev->bus->dev->path.pci.devfn + (1 << 3); - sb_pci_main_dev = dev_find_slot(bus_dev->bus->dev->bus->secondary, devfn); + sb_pci_main_dev = pcidev_path_behind(bus_dev->bus->dev->bus, + devfn); // index = ((dev->path.pci.devfn & ~7) >> 3) + 8; } else { // same bus @@ -51,7 +52,7 @@ void bcm5785_enable(struct device *dev) else if (dev->device == 0x0223) // USB { devfn -= (1<<3); } } - sb_pci_main_dev = dev_find_slot(dev->bus->secondary, devfn); + sb_pci_main_dev = pcidev_path_behind(dev->bus, devfn); // index = dev->path.pci.devfn & 7; } if (!sb_pci_main_dev) { -- cgit v1.2.3