diff options
Diffstat (limited to 'drivers/acpi/namespace/nsnames.c')
-rw-r--r-- | drivers/acpi/namespace/nsnames.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c index 5400728eb791..411e1f8b11d0 100644 --- a/drivers/acpi/namespace/nsnames.c +++ b/drivers/acpi/namespace/nsnames.c | |||
@@ -5,7 +5,7 @@ | |||
5 | ******************************************************************************/ | 5 | ******************************************************************************/ |
6 | 6 | ||
7 | /* | 7 | /* |
8 | * Copyright (C) 2000 - 2005, R. Byron Moore | 8 | * Copyright (C) 2000 - 2006, R. Byron Moore |
9 | * All rights reserved. | 9 | * All rights reserved. |
10 | * | 10 | * |
11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without |
@@ -75,7 +75,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node, | |||
75 | acpi_size index; | 75 | acpi_size index; |
76 | struct acpi_namespace_node *parent_node; | 76 | struct acpi_namespace_node *parent_node; |
77 | 77 | ||
78 | ACPI_FUNCTION_NAME("ns_build_external_path"); | 78 | ACPI_FUNCTION_ENTRY(); |
79 | 79 | ||
80 | /* Special case for root */ | 80 | /* Special case for root */ |
81 | 81 | ||
@@ -110,9 +110,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node, | |||
110 | name_buffer[index] = AML_ROOT_PREFIX; | 110 | name_buffer[index] = AML_ROOT_PREFIX; |
111 | 111 | ||
112 | if (index != 0) { | 112 | if (index != 0) { |
113 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 113 | ACPI_REPORT_ERROR(("Could not construct pathname; index=%X, size=%X, Path=%s\n", (u32) index, (u32) size, &name_buffer[size])); |
114 | "Could not construct pathname; index=%X, size=%X, Path=%s\n", | ||
115 | (u32) index, (u32) size, &name_buffer[size])); | ||
116 | } | 114 | } |
117 | 115 | ||
118 | return; | 116 | return; |
@@ -148,7 +146,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node) | |||
148 | 146 | ||
149 | name_buffer = ACPI_MEM_CALLOCATE(size); | 147 | name_buffer = ACPI_MEM_CALLOCATE(size); |
150 | if (!name_buffer) { | 148 | if (!name_buffer) { |
151 | ACPI_REPORT_ERROR(("ns_get_table_pathname: allocation failure\n")); | 149 | ACPI_REPORT_ERROR(("Allocation failure\n")); |
152 | return_PTR(NULL); | 150 | return_PTR(NULL); |
153 | } | 151 | } |
154 | 152 | ||