Commit e3863094 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

ACPI: Drop the second argument of acpi_bus_scan()

After the removal of acpi_start_single_object() and acpi_bus_start()
the second argument of acpi_bus_scan() is not necessary any more,
so drop it and update acpi_bus_check_add() accordingly.
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
Acked-by: default avatarToshi Kani <toshi.kani@hp.com>
parent 636458de
...@@ -1551,8 +1551,8 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type, ...@@ -1551,8 +1551,8 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type,
return 0; return 0;
} }
static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl, static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
void *context, void **return_value) void *not_used, void **return_value)
{ {
struct acpi_device *device = NULL; struct acpi_device *device = NULL;
int type; int type;
...@@ -1584,7 +1584,7 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl, ...@@ -1584,7 +1584,7 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl,
if (!device) if (!device)
return AE_CTRL_DEPTH; return AE_CTRL_DEPTH;
device->add_type = context ? ACPI_BUS_ADD_START : ACPI_BUS_ADD_MATCH; device->add_type = ACPI_BUS_ADD_START;
acpi_hot_add_bind(device); acpi_hot_add_bind(device);
out: out:
...@@ -1621,18 +1621,16 @@ static acpi_status acpi_bus_device_attach(acpi_handle handle, u32 lvl_not_used, ...@@ -1621,18 +1621,16 @@ static acpi_status acpi_bus_device_attach(acpi_handle handle, u32 lvl_not_used,
return status; return status;
} }
static int acpi_bus_scan(acpi_handle handle, bool start, static int acpi_bus_scan(acpi_handle handle, struct acpi_device **child)
struct acpi_device **child)
{ {
void *device = NULL; void *device = NULL;
acpi_status status; acpi_status status;
int ret = -ENODEV; int ret = -ENODEV;
status = acpi_bus_check_add(handle, 0, (void *)start, &device); status = acpi_bus_check_add(handle, 0, NULL, &device);
if (ACPI_SUCCESS(status)) if (ACPI_SUCCESS(status))
acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX, acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
acpi_bus_check_add, NULL, (void *)start, acpi_bus_check_add, NULL, NULL, &device);
&device);
if (!device) if (!device)
goto out; goto out;
...@@ -1676,7 +1674,7 @@ int acpi_bus_add(acpi_handle handle, struct acpi_device **ret) ...@@ -1676,7 +1674,7 @@ int acpi_bus_add(acpi_handle handle, struct acpi_device **ret)
{ {
int err; int err;
err = acpi_bus_scan(handle, false, ret); err = acpi_bus_scan(handle, ret);
if (err) if (err)
return err; return err;
...@@ -1782,7 +1780,7 @@ int __init acpi_scan_init(void) ...@@ -1782,7 +1780,7 @@ int __init acpi_scan_init(void)
/* /*
* Enumerate devices in the ACPI namespace. * Enumerate devices in the ACPI namespace.
*/ */
result = acpi_bus_scan(ACPI_ROOT_OBJECT, true, &acpi_root); result = acpi_bus_scan(ACPI_ROOT_OBJECT, &acpi_root);
if (!result) if (!result)
result = acpi_bus_scan_fixed(); result = acpi_bus_scan_fixed();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment