renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-20 19:43:58 +08:00
Code

ACPI / dock: Rework and simplify find_dock_devices()

Browse Source 
Since acpi_walk_namespace() calls find_dock_devices() during tree
pre-order visit, the latter doesn't need to add devices whose
parents have _EJD pointing to the docking station to the list of
that station's dependent devices, because those parents are going to
be added to that list anyway and the removal of a parent will take
care of the removal of its children in those cases.

For this reason, rework find_dock_devices() to only call
add_dock_dependent_device() for devices whose _EJD point directy to
the docking station represented by its context argument and simplify
it slightly.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
This commit is contained in:
Rafael J. Wysocki 2013-06-30 23:46:02 +02:00
parent d460acebd7
commit 96c0a4d490
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/acpi/dock.c
View File

@ -741,29 +741,16 @@ static struct notifier_block dock_acpi_notifier = {
* check to see if an object has an _EJD method. If it does, then it * check to see if an object has an _EJD method. If it does, then it
* will see if it is dependent on the dock station. * will see if it is dependent on the dock station.
*/ */
static acpi_status __init static acpi_status __init find_dock_devices(acpi_handle handle, u32 lvl,
find_dock_devices(acpi_handle handle, u32 lvl, void *context, void **rv) void *context, void **rv)
{ {
acpi_status status;
acpi_handle tmp, parent;
struct dock_station *ds = context; struct dock_station *ds = context;
acpi_handle ejd = NULL;
status = acpi_bus_get_ejd(handle, &tmp); acpi_bus_get_ejd(handle, &ejd);
if (ACPI_FAILURE(status)) { if (ejd == ds->handle)
/* try the parent device as well */
status = acpi_get_parent(handle, &parent);
if (ACPI_FAILURE(status))
goto fdd_out;
/* see if parent is dependent on dock */
status = acpi_bus_get_ejd(parent, &tmp);
if (ACPI_FAILURE(status))
goto fdd_out;
}
if (tmp == ds->handle)
add_dock_dependent_device(ds, handle); add_dock_dependent_device(ds, handle);
fdd_out:
return AE_OK; return AE_OK;
} }