summaryrefslogtreecommitdiffstats
path: root/sys/dev/acpica/acpi_pcib_acpi.c
diff options
context:
space:
mode:
authornjl <njl@FreeBSD.org>2004-06-29 19:02:27 +0000
committernjl <njl@FreeBSD.org>2004-06-29 19:02:27 +0000
commit72ad681e8442865d104086e9a6961818cc435085 (patch)
tree6f1a0ff9b933c25a9eb2bf967f62e708efe64c5f /sys/dev/acpica/acpi_pcib_acpi.c
parent2a43f50bb099f7154fa37e95153f1432d00c8667 (diff)
downloadFreeBSD-src-72ad681e8442865d104086e9a6961818cc435085.zip
FreeBSD-src-72ad681e8442865d104086e9a6961818cc435085.tar.gz
Use the acpi_id_probe() method instead of acpi_MatchHid(), which is now
static.
Diffstat (limited to 'sys/dev/acpica/acpi_pcib_acpi.c')
-rw-r--r--sys/dev/acpica/acpi_pcib_acpi.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c
index cbb9bee..51afe5f 100644
--- a/sys/dev/acpica/acpi_pcib_acpi.c
+++ b/sys/dev/acpica/acpi_pcib_acpi.c
@@ -115,16 +115,16 @@ MODULE_DEPEND(acpi_pcib, acpi, 1, 1, 1);
static int
acpi_pcib_acpi_probe(device_t dev)
{
+ static char *pcib_ids[] = { "PNP0A03", NULL };
- if (acpi_get_type(dev) == ACPI_TYPE_DEVICE && !acpi_disabled("pci") &&
- acpi_MatchHid(acpi_get_handle(dev), "PNP0A03")) {
+ if (acpi_disabled("pcib") ||
+ ACPI_ID_PROBE(device_get_parent(dev), dev, pcib_ids) == NULL)
+ return (ENXIO);
- if (pci_cfgregopen() == 0)
- return (ENXIO);
- device_set_desc(dev, "ACPI Host-PCI bridge");
- return (0);
- }
- return (ENXIO);
+ if (pci_cfgregopen() == 0)
+ return (ENXIO);
+ device_set_desc(dev, "ACPI Host-PCI bridge");
+ return (0);
}
static int
OpenPOWER on IntegriCloud