Skip to content

Commit

Permalink
ACPICA: Eliminate extra call to NsGetParentNode
Browse files Browse the repository at this point in the history
Was called twice in the same function with the same parameter.
Alex Chiang.

Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Alex Chiang authored and Len Brown committed May 27, 2009
1 parent f5407af commit c446eed
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/acpi/acpica/nsxfobj.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_type)
acpi_status acpi_get_parent(acpi_handle handle, acpi_handle * ret_handle)
{
struct acpi_namespace_node *node;
struct acpi_namespace_node *parent_node;
acpi_status status;

if (!ret_handle) {
Expand Down Expand Up @@ -189,12 +190,12 @@ acpi_status acpi_get_parent(acpi_handle handle, acpi_handle * ret_handle)

/* Get the parent entry */

*ret_handle =
acpi_ns_convert_entry_to_handle(acpi_ns_get_parent_node(node));
parent_node = acpi_ns_get_parent_node(node);
*ret_handle = acpi_ns_convert_entry_to_handle(parent_node);

/* Return exception if parent is null */

if (!acpi_ns_get_parent_node(node)) {
if (!parent_node) {
status = AE_NULL_ENTRY;
}

Expand Down

0 comments on commit c446eed

Please sign in to comment.