acpi: Restore old AcpiWalkNamespace semantic
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Sun, 17 Apr 2011 04:12:17 +0000 (12:12 +0800)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Sun, 17 Apr 2011 04:12:17 +0000 (12:12 +0800)
Noticed-by: y0netan1@
sys/dev/acpica5/acpi.c
sys/dev/acpica5/acpi_pci.c
sys/dev/acpica5/acpi_video/acpi_video.c

index 4c9f060..8b8a4b8 100644 (file)
@@ -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);
 }
index bf760af..a457dfc 100644 (file)
@@ -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));
 }
index 9dd5046..b28d572 100644 (file)
@@ -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));