|
@@ -158,8 +158,6 @@ acpi_status
|
|
|
acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer *buffer)
|
|
|
{
|
|
|
acpi_status status;
|
|
|
- struct acpi_namespace_node *node;
|
|
|
- const char *node_name;
|
|
|
|
|
|
/* Parameter validation */
|
|
|
|
|
@@ -172,18 +170,6 @@ acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer *buffer)
|
|
|
return (status);
|
|
|
}
|
|
|
|
|
|
- if (name_type == ACPI_FULL_PATHNAME ||
|
|
|
- name_type == ACPI_FULL_PATHNAME_NO_TRAILING) {
|
|
|
-
|
|
|
- /* Get the full pathname (From the namespace root) */
|
|
|
-
|
|
|
- status = acpi_ns_handle_to_pathname(handle, buffer,
|
|
|
- name_type ==
|
|
|
- ACPI_FULL_PATHNAME ? FALSE :
|
|
|
- TRUE);
|
|
|
- return (status);
|
|
|
- }
|
|
|
-
|
|
|
/*
|
|
|
* Wants the single segment ACPI name.
|
|
|
* Validate handle and convert to a namespace Node
|
|
@@ -193,27 +179,20 @@ acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer *buffer)
|
|
|
return (status);
|
|
|
}
|
|
|
|
|
|
- node = acpi_ns_validate_handle(handle);
|
|
|
- if (!node) {
|
|
|
- status = AE_BAD_PARAMETER;
|
|
|
- goto unlock_and_exit;
|
|
|
- }
|
|
|
-
|
|
|
- /* Validate/Allocate/Clear caller buffer */
|
|
|
-
|
|
|
- status = acpi_ut_initialize_buffer(buffer, ACPI_PATH_SEGMENT_LENGTH);
|
|
|
- if (ACPI_FAILURE(status)) {
|
|
|
- goto unlock_and_exit;
|
|
|
- }
|
|
|
+ if (name_type == ACPI_FULL_PATHNAME ||
|
|
|
+ name_type == ACPI_FULL_PATHNAME_NO_TRAILING) {
|
|
|
|
|
|
- /* Just copy the ACPI name from the Node and zero terminate it */
|
|
|
+ /* Get the full pathname (From the namespace root) */
|
|
|
|
|
|
- node_name = acpi_ut_get_node_name(node);
|
|
|
- ACPI_MOVE_NAME(buffer->pointer, node_name);
|
|
|
- ((char *)buffer->pointer)[ACPI_NAME_SIZE] = 0;
|
|
|
- status = AE_OK;
|
|
|
+ status = acpi_ns_handle_to_pathname(handle, buffer,
|
|
|
+ name_type ==
|
|
|
+ ACPI_FULL_PATHNAME ? FALSE :
|
|
|
+ TRUE);
|
|
|
+ } else {
|
|
|
+ /* Get the single name */
|
|
|
|
|
|
-unlock_and_exit:
|
|
|
+ status = acpi_ns_handle_to_name(handle, buffer);
|
|
|
+ }
|
|
|
|
|
|
(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
|
|
|
return (status);
|