diff options
Diffstat (limited to 'src/acpi')
| -rw-r--r-- | src/acpi/acpi.c | 4 | ||||
| -rw-r--r-- | src/acpi/device.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c index 0e4798c448..6bf452e919 100644 --- a/src/acpi/acpi.c +++ b/src/acpi/acpi.c @@ -700,8 +700,8 @@ void acpi_create_ipmi(const struct device *device, if (device->path.type == DEVICE_PATH_PCI) { spmi->pci_device_flag = ACPI_IPMI_PCI_DEVICE_FLAG; - spmi->pci_segment_group = device->bus->segment_group; - spmi->pci_bus = device->bus->secondary; + spmi->pci_segment_group = device->upstream->segment_group; + spmi->pci_bus = device->upstream->secondary; spmi->pci_device = device->path.pci.devfn >> 3; spmi->pci_function = device->path.pci.devfn & 0x7; } else if (type != IPMI_INTERFACE_SSIF) { diff --git a/src/acpi/device.c b/src/acpi/device.c index 823cdbeb5a..368b86c576 100644 --- a/src/acpi/device.c +++ b/src/acpi/device.c @@ -83,8 +83,8 @@ const char *acpi_device_name(const struct device *dev) } /* Walk up the tree to find if any parent can identify this device */ - while (pdev->bus) { - pdev = pdev->bus->dev; + while (pdev->upstream) { + pdev = pdev->upstream->dev; if (!pdev) break; if (is_root_device(pdev)) @@ -147,8 +147,8 @@ static ssize_t acpi_device_path_fill(const struct device *dev, char *buf, return cur; /* Walk up the tree to the root device */ - if (!is_root_device(dev) && dev->bus && dev->bus->dev) - next = acpi_device_path_fill(dev->bus->dev, buf, buf_len, cur); + if (!is_root_device(dev) && dev->upstream && dev->upstream->dev) + next = acpi_device_path_fill(dev->upstream->dev, buf, buf_len, cur); if (next < 0) return next; @@ -182,10 +182,10 @@ const char *acpi_device_scope(const struct device *dev) { static char buf[DEVICE_PATH_MAX] = {}; - if (!dev || !dev->bus || !dev->bus->dev) + if (!dev || !dev->upstream || !dev->upstream->dev) return NULL; - if (acpi_device_path_fill(dev->bus->dev, buf, sizeof(buf), 0) <= 0) + if (acpi_device_path_fill(dev->upstream->dev, buf, sizeof(buf), 0) <= 0) return NULL; return buf; |