Commit 5c478f49 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown

ACPI: add acpi_bus_get_parent() and remove "parent" arguments

This patch adds acpi_bus_get_parent(), which ascends the namespace until
it finds a parent with an acpi_device.

Then we use acpi_bus_get_parent() in acpi_add_single_object(), so callers
don't have to figure out or keep track of the parent acpi_device.
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 77c24888
...@@ -662,6 +662,33 @@ EXPORT_SYMBOL(acpi_bus_unregister_driver); ...@@ -662,6 +662,33 @@ EXPORT_SYMBOL(acpi_bus_unregister_driver);
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
Device Enumeration Device Enumeration
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
static struct acpi_device *acpi_bus_get_parent(acpi_handle handle)
{
acpi_status status;
int ret;
struct acpi_device *device;
/*
* Fixed hardware devices do not appear in the namespace and do not
* have handles, but we fabricate acpi_devices for them, so we have
* to deal with them specially.
*/
if (handle == NULL)
return acpi_root;
do {
status = acpi_get_parent(handle, &handle);
if (status == AE_NULL_ENTRY)
return NULL;
if (ACPI_FAILURE(status))
return acpi_root;
ret = acpi_bus_get_device(handle, &device);
if (ret == 0)
return device;
} while (1);
}
acpi_status acpi_status
acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd) acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd)
{ {
...@@ -1217,9 +1244,8 @@ static int acpi_bus_remove(struct acpi_device *dev, int rmdevice) ...@@ -1217,9 +1244,8 @@ static int acpi_bus_remove(struct acpi_device *dev, int rmdevice)
return 0; return 0;
} }
static int static int acpi_add_single_object(struct acpi_device **child,
acpi_add_single_object(struct acpi_device **child, acpi_handle handle, int type,
struct acpi_device *parent, acpi_handle handle, int type,
struct acpi_bus_ops *ops) struct acpi_bus_ops *ops)
{ {
int result; int result;
...@@ -1234,7 +1260,7 @@ acpi_add_single_object(struct acpi_device **child, ...@@ -1234,7 +1260,7 @@ acpi_add_single_object(struct acpi_device **child,
device->device_type = type; device->device_type = type;
device->handle = handle; device->handle = handle;
device->parent = parent; device->parent = acpi_bus_get_parent(handle);
device->bus_ops = *ops; /* workround for not call .start */ device->bus_ops = *ops; /* workround for not call .start */
acpi_device_get_busid(device); acpi_device_get_busid(device);
...@@ -1434,8 +1460,8 @@ static int acpi_bus_scan(struct acpi_device *start, struct acpi_bus_ops *ops) ...@@ -1434,8 +1460,8 @@ static int acpi_bus_scan(struct acpi_device *start, struct acpi_bus_ops *ops)
} }
if (ops->acpi_op_add) if (ops->acpi_op_add)
status = acpi_add_single_object(&child, parent, status = acpi_add_single_object(&child, chandle, type,
chandle, type, ops); ops);
else else
status = acpi_bus_get_device(chandle, &child); status = acpi_bus_get_device(chandle, &child);
...@@ -1488,7 +1514,7 @@ acpi_bus_add(struct acpi_device **child, ...@@ -1488,7 +1514,7 @@ acpi_bus_add(struct acpi_device **child,
memset(&ops, 0, sizeof(ops)); memset(&ops, 0, sizeof(ops));
ops.acpi_op_add = 1; ops.acpi_op_add = 1;
result = acpi_add_single_object(child, parent, handle, type, &ops); result = acpi_add_single_object(child, handle, type, &ops);
if (!result) if (!result)
result = acpi_bus_scan(*child, &ops); result = acpi_bus_scan(*child, &ops);
...@@ -1584,15 +1610,13 @@ static int acpi_bus_scan_fixed(void) ...@@ -1584,15 +1610,13 @@ static int acpi_bus_scan_fixed(void)
* Enumerate all fixed-feature devices. * Enumerate all fixed-feature devices.
*/ */
if ((acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON) == 0) { if ((acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON) == 0) {
result = acpi_add_single_object(&device, acpi_root, result = acpi_add_single_object(&device, NULL,
NULL,
ACPI_BUS_TYPE_POWER_BUTTON, ACPI_BUS_TYPE_POWER_BUTTON,
&ops); &ops);
} }
if ((acpi_gbl_FADT.flags & ACPI_FADT_SLEEP_BUTTON) == 0) { if ((acpi_gbl_FADT.flags & ACPI_FADT_SLEEP_BUTTON) == 0) {
result = acpi_add_single_object(&device, acpi_root, result = acpi_add_single_object(&device, NULL,
NULL,
ACPI_BUS_TYPE_SLEEP_BUTTON, ACPI_BUS_TYPE_SLEEP_BUTTON,
&ops); &ops);
} }
...@@ -1618,7 +1642,7 @@ int __init acpi_scan_init(void) ...@@ -1618,7 +1642,7 @@ int __init acpi_scan_init(void)
/* /*
* Create the root device in the bus's device tree * Create the root device in the bus's device tree
*/ */
result = acpi_add_single_object(&acpi_root, NULL, ACPI_ROOT_OBJECT, result = acpi_add_single_object(&acpi_root, ACPI_ROOT_OBJECT,
ACPI_BUS_TYPE_SYSTEM, &ops); ACPI_BUS_TYPE_SYSTEM, &ops);
if (result) if (result)
goto Done; goto Done;
......
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