From b3af53387ad0c37402fc134bc10f9199bc535d7b Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Sun, 17 Apr 2011 12:12:17 +0800 Subject: [PATCH] acpi: Restore old AcpiWalkNamespace semantic Noticed-by: y0netan1@ --- sys/dev/acpica5/acpi.c | 12 ++++++------ sys/dev/acpica5/acpi_pci.c | 2 +- sys/dev/acpica5/acpi_video/acpi_video.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/dev/acpica5/acpi.c b/sys/dev/acpica5/acpi.c index 4c9f060d9d..8b8a4b8d18 100644 --- a/sys/dev/acpica5/acpi.c +++ b/sys/dev/acpica5/acpi.c @@ -1419,8 +1419,8 @@ acpi_device_scan_children(device_t bus, device_t dev, int max_depth, ctx.user_fn = user_fn; ctx.arg = arg; ctx.parent = h; - return (AcpiWalkNamespace(ACPI_TYPE_ANY, h, max_depth, NULL, - acpi_device_scan_cb, &ctx, NULL)); + return (AcpiWalkNamespace(ACPI_TYPE_ANY, h, max_depth, + acpi_device_scan_cb, NULL, &ctx, NULL)); } /* @@ -1543,8 +1543,8 @@ acpi_probe_children(device_t bus) * devices as they appear, which might be smarter.) */ ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "namespace scan\n")); - AcpiWalkNamespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT, 100, NULL, - acpi_probe_child, bus, NULL); + AcpiWalkNamespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT, 100, + acpi_probe_child, NULL, bus, NULL); /* Pre-allocate resources for our rman from any sysresource devices. */ acpi_sysres_alloc(bus); @@ -2606,8 +2606,8 @@ acpi_wake_prep_walk(int sstate) ACPI_HANDLE sb_handle; if (ACPI_SUCCESS(AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_SB_", &sb_handle))) { - AcpiWalkNamespace(ACPI_TYPE_DEVICE, sb_handle, 100, NULL, - acpi_wake_prep, &sstate, NULL); + AcpiWalkNamespace(ACPI_TYPE_DEVICE, sb_handle, 100, + acpi_wake_prep, NULL, &sstate, NULL); } return (0); } diff --git a/sys/dev/acpica5/acpi_pci.c b/sys/dev/acpica5/acpi_pci.c index bf760af151..a457dfceef 100644 --- a/sys/dev/acpica5/acpi_pci.c +++ b/sys/dev/acpica5/acpi_pci.c @@ -318,7 +318,7 @@ acpi_pci_attach(device_t dev) */ pci_add_children(dev, domain, busno, sizeof(struct acpi_pci_devinfo)); AcpiWalkNamespace(ACPI_TYPE_DEVICE, acpi_get_handle(dev), 1, - NULL, acpi_pci_save_handle, dev, NULL); + acpi_pci_save_handle, NULL, dev, NULL); return (bus_generic_attach(dev)); } diff --git a/sys/dev/acpica5/acpi_video/acpi_video.c b/sys/dev/acpica5/acpi_video/acpi_video.c index 9dd50469e3..b28d572c90 100644 --- a/sys/dev/acpica5/acpi_video/acpi_video.c +++ b/sys/dev/acpica5/acpi_video/acpi_video.c @@ -807,7 +807,7 @@ vid_enum_outputs(ACPI_HANDLE handle, argset.dod_pkg = res; argset.count = 0; status = AcpiWalkNamespace(ACPI_TYPE_DEVICE, handle, 1, - NULL, vid_enum_outputs_subr, &argset, NULL); + vid_enum_outputs_subr, NULL, &argset, NULL); if (ACPI_FAILURE(status)) kprintf("failed walking down %s - %s\n", acpi_name(handle), AcpiFormatException(status)); -- 2.41.0