diff options
Diffstat (limited to 'drivers/acpi/executer/exnames.c')
-rw-r--r-- | drivers/acpi/executer/exnames.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/acpi/executer/exnames.c b/drivers/acpi/executer/exnames.c index de3216b6a4fc..054fe5e1a314 100644 --- a/drivers/acpi/executer/exnames.c +++ b/drivers/acpi/executer/exnames.c | |||
@@ -99,8 +99,8 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs) | |||
99 | */ | 99 | */ |
100 | name_string = ACPI_MEM_ALLOCATE(size_needed); | 100 | name_string = ACPI_MEM_ALLOCATE(size_needed); |
101 | if (!name_string) { | 101 | if (!name_string) { |
102 | ACPI_REPORT_ERROR(("Could not allocate size %d\n", | 102 | ACPI_ERROR((AE_INFO, |
103 | size_needed)); | 103 | "Could not allocate size %d", size_needed)); |
104 | return_PTR(NULL); | 104 | return_PTR(NULL); |
105 | } | 105 | } |
106 | 106 | ||
@@ -168,7 +168,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string) | |||
168 | char_buf[0] = *aml_address; | 168 | char_buf[0] = *aml_address; |
169 | 169 | ||
170 | if ('0' <= char_buf[0] && char_buf[0] <= '9') { | 170 | if ('0' <= char_buf[0] && char_buf[0] <= '9') { |
171 | ACPI_REPORT_ERROR(("Invalid leading digit: %c\n", char_buf[0])); | 171 | ACPI_ERROR((AE_INFO, "Invalid leading digit: %c", char_buf[0])); |
172 | return_ACPI_STATUS(AE_CTRL_PENDING); | 172 | return_ACPI_STATUS(AE_CTRL_PENDING); |
173 | } | 173 | } |
174 | 174 | ||
@@ -211,8 +211,9 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string) | |||
211 | * the required 4 | 211 | * the required 4 |
212 | */ | 212 | */ |
213 | status = AE_AML_BAD_NAME; | 213 | status = AE_AML_BAD_NAME; |
214 | ACPI_REPORT_ERROR(("Bad character %02x in name, at %p\n", | 214 | ACPI_ERROR((AE_INFO, |
215 | *aml_address, aml_address)); | 215 | "Bad character %02x in name, at %p", |
216 | *aml_address, aml_address)); | ||
216 | } | 217 | } |
217 | 218 | ||
218 | *in_aml_address = ACPI_CAST_PTR(u8, aml_address); | 219 | *in_aml_address = ACPI_CAST_PTR(u8, aml_address); |
@@ -411,7 +412,7 @@ acpi_ex_get_name_string(acpi_object_type data_type, | |||
411 | if (AE_CTRL_PENDING == status && has_prefix) { | 412 | if (AE_CTRL_PENDING == status && has_prefix) { |
412 | /* Ran out of segments after processing a prefix */ | 413 | /* Ran out of segments after processing a prefix */ |
413 | 414 | ||
414 | ACPI_REPORT_ERROR(("Malformed Name at %p\n", name_string)); | 415 | ACPI_ERROR((AE_INFO, "Malformed Name at %p", name_string)); |
415 | status = AE_AML_BAD_NAME; | 416 | status = AE_AML_BAD_NAME; |
416 | } | 417 | } |
417 | 418 | ||