diff options
Diffstat (limited to 'drivers/acpi/executer/exprep.c')
-rw-r--r-- | drivers/acpi/executer/exprep.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c index 7476c363e407..3bde780c94cf 100644 --- a/drivers/acpi/executer/exprep.c +++ b/drivers/acpi/executer/exprep.c | |||
@@ -6,7 +6,7 @@ | |||
6 | *****************************************************************************/ | 6 | *****************************************************************************/ |
7 | 7 | ||
8 | /* | 8 | /* |
9 | * Copyright (C) 2000 - 2005, R. Byron Moore | 9 | * Copyright (C) 2000 - 2006, R. Byron Moore |
10 | * All rights reserved. | 10 | * All rights reserved. |
11 | * | 11 | * |
12 | * Redistribution and use in source and binary forms, with or without | 12 | * Redistribution and use in source and binary forms, with or without |
@@ -274,9 +274,8 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc, | |||
274 | default: | 274 | default: |
275 | /* Invalid field access type */ | 275 | /* Invalid field access type */ |
276 | 276 | ||
277 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 277 | ACPI_REPORT_ERROR(("Unknown field access type %X\n", access)); |
278 | "Unknown field access type %X\n", access)); | 278 | return_UINT32(0); |
279 | return_VALUE(0); | ||
280 | } | 279 | } |
281 | 280 | ||
282 | if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_BUFFER_FIELD) { | 281 | if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_BUFFER_FIELD) { |
@@ -289,7 +288,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc, | |||
289 | } | 288 | } |
290 | 289 | ||
291 | *return_byte_alignment = byte_alignment; | 290 | *return_byte_alignment = byte_alignment; |
292 | return_VALUE(bit_length); | 291 | return_UINT32(bit_length); |
293 | } | 292 | } |
294 | 293 | ||
295 | /******************************************************************************* | 294 | /******************************************************************************* |
@@ -422,15 +421,13 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info) | |||
422 | 421 | ||
423 | if (info->field_type != ACPI_TYPE_LOCAL_INDEX_FIELD) { | 422 | if (info->field_type != ACPI_TYPE_LOCAL_INDEX_FIELD) { |
424 | if (!info->region_node) { | 423 | if (!info->region_node) { |
425 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null region_node\n")); | 424 | ACPI_REPORT_ERROR(("Null region_node\n")); |
426 | return_ACPI_STATUS(AE_AML_NO_OPERAND); | 425 | return_ACPI_STATUS(AE_AML_NO_OPERAND); |
427 | } | 426 | } |
428 | 427 | ||
429 | type = acpi_ns_get_type(info->region_node); | 428 | type = acpi_ns_get_type(info->region_node); |
430 | if (type != ACPI_TYPE_REGION) { | 429 | if (type != ACPI_TYPE_REGION) { |
431 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 430 | ACPI_REPORT_ERROR(("Needed Region, found type %X (%s)\n", type, acpi_ut_get_type_name(type))); |
432 | "Needed Region, found type %X (%s)\n", | ||
433 | type, acpi_ut_get_type_name(type))); | ||
434 | 431 | ||
435 | return_ACPI_STATUS(AE_AML_OPERAND_TYPE); | 432 | return_ACPI_STATUS(AE_AML_OPERAND_TYPE); |
436 | } | 433 | } |