diff options
Diffstat (limited to 'drivers/acpi/namespace/nsutils.c')
-rw-r--r-- | drivers/acpi/namespace/nsutils.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/acpi/namespace/nsutils.c b/drivers/acpi/namespace/nsutils.c index bc779fdd3caf..3e7cad549a38 100644 --- a/drivers/acpi/namespace/nsutils.c +++ b/drivers/acpi/namespace/nsutils.c | |||
@@ -85,7 +85,7 @@ acpi_ns_report_error(char *module_name, | |||
85 | if (lookup_status == AE_BAD_CHARACTER) { | 85 | if (lookup_status == AE_BAD_CHARACTER) { |
86 | /* There is a non-ascii character in the name */ | 86 | /* There is a non-ascii character in the name */ |
87 | 87 | ||
88 | acpi_os_printf("[0x%4.4X] (NON-ASCII)\n", | 88 | acpi_os_printf("[0x%4.4X] (NON-ASCII)", |
89 | *(ACPI_CAST_PTR(u32, internal_name))); | 89 | *(ACPI_CAST_PTR(u32, internal_name))); |
90 | } else { | 90 | } else { |
91 | /* Convert path to external format */ | 91 | /* Convert path to external format */ |
@@ -106,7 +106,7 @@ acpi_ns_report_error(char *module_name, | |||
106 | } | 106 | } |
107 | } | 107 | } |
108 | 108 | ||
109 | acpi_os_printf("Namespace lookup failure, %s\n", | 109 | acpi_os_printf(" Namespace lookup failure, %s\n", |
110 | acpi_format_exception(lookup_status)); | 110 | acpi_format_exception(lookup_status)); |
111 | } | 111 | } |
112 | 112 | ||
@@ -242,7 +242,7 @@ acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node) | |||
242 | ACPI_FUNCTION_TRACE("ns_get_type"); | 242 | ACPI_FUNCTION_TRACE("ns_get_type"); |
243 | 243 | ||
244 | if (!node) { | 244 | if (!node) { |
245 | ACPI_REPORT_WARNING(("Null Node parameter\n")); | 245 | ACPI_WARNING((AE_INFO, "Null Node parameter")); |
246 | return_UINT32(ACPI_TYPE_ANY); | 246 | return_UINT32(ACPI_TYPE_ANY); |
247 | } | 247 | } |
248 | 248 | ||
@@ -269,7 +269,7 @@ u32 acpi_ns_local(acpi_object_type type) | |||
269 | if (!acpi_ut_valid_object_type(type)) { | 269 | if (!acpi_ut_valid_object_type(type)) { |
270 | /* Type code out of range */ | 270 | /* Type code out of range */ |
271 | 271 | ||
272 | ACPI_REPORT_WARNING(("Invalid Object Type %X\n", type)); | 272 | ACPI_WARNING((AE_INFO, "Invalid Object Type %X", type)); |
273 | return_UINT32(ACPI_NS_NORMAL); | 273 | return_UINT32(ACPI_NS_NORMAL); |
274 | } | 274 | } |
275 | 275 | ||
@@ -621,7 +621,7 @@ acpi_ns_externalize_name(u32 internal_name_length, | |||
621 | * with internal_name (invalid format). | 621 | * with internal_name (invalid format). |
622 | */ | 622 | */ |
623 | if (required_length > internal_name_length) { | 623 | if (required_length > internal_name_length) { |
624 | ACPI_REPORT_ERROR(("Invalid internal name\n")); | 624 | ACPI_ERROR((AE_INFO, "Invalid internal name")); |
625 | return_ACPI_STATUS(AE_BAD_PATHNAME); | 625 | return_ACPI_STATUS(AE_BAD_PATHNAME); |
626 | } | 626 | } |
627 | 627 | ||
@@ -797,7 +797,7 @@ u32 acpi_ns_opens_scope(acpi_object_type type) | |||
797 | if (!acpi_ut_valid_object_type(type)) { | 797 | if (!acpi_ut_valid_object_type(type)) { |
798 | /* type code out of range */ | 798 | /* type code out of range */ |
799 | 799 | ||
800 | ACPI_REPORT_WARNING(("Invalid Object Type %X\n", type)); | 800 | ACPI_WARNING((AE_INFO, "Invalid Object Type %X", type)); |
801 | return_UINT32(ACPI_NS_NORMAL); | 801 | return_UINT32(ACPI_NS_NORMAL); |
802 | } | 802 | } |
803 | 803 | ||