diff options
Diffstat (limited to 'drivers/acpi/events/evgpeblk.c')
-rw-r--r-- | drivers/acpi/events/evgpeblk.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c index 8efca2eac27e..3b9bbdda551d 100644 --- a/drivers/acpi/events/evgpeblk.c +++ b/drivers/acpi/events/evgpeblk.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 |
@@ -279,9 +279,7 @@ acpi_ev_save_method_info(acpi_handle obj_handle, | |||
279 | default: | 279 | default: |
280 | /* Unknown method type, just ignore it! */ | 280 | /* Unknown method type, just ignore it! */ |
281 | 281 | ||
282 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 282 | ACPI_REPORT_ERROR(("Unknown GPE method type: %s (name not of form _Lxx or _Exx)\n", name)); |
283 | "Unknown GPE method type: %s (name not of form _Lxx or _Exx)\n", | ||
284 | name)); | ||
285 | return_ACPI_STATUS(AE_OK); | 283 | return_ACPI_STATUS(AE_OK); |
286 | } | 284 | } |
287 | 285 | ||
@@ -291,9 +289,7 @@ acpi_ev_save_method_info(acpi_handle obj_handle, | |||
291 | if (gpe_number == ACPI_UINT32_MAX) { | 289 | if (gpe_number == ACPI_UINT32_MAX) { |
292 | /* Conversion failed; invalid method, just ignore it */ | 290 | /* Conversion failed; invalid method, just ignore it */ |
293 | 291 | ||
294 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 292 | ACPI_REPORT_ERROR(("Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)\n", name)); |
295 | "Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)\n", | ||
296 | name)); | ||
297 | return_ACPI_STATUS(AE_OK); | 293 | return_ACPI_STATUS(AE_OK); |
298 | } | 294 | } |
299 | 295 | ||
@@ -527,9 +523,7 @@ static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 | |||
527 | acpi_ev_gpe_xrupt_handler, | 523 | acpi_ev_gpe_xrupt_handler, |
528 | gpe_xrupt); | 524 | gpe_xrupt); |
529 | if (ACPI_FAILURE(status)) { | 525 | if (ACPI_FAILURE(status)) { |
530 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 526 | ACPI_REPORT_ERROR(("Could not install GPE interrupt handler at level 0x%X\n", interrupt_number)); |
531 | "Could not install GPE interrupt handler at level 0x%X\n", | ||
532 | interrupt_number)); | ||
533 | return_PTR(NULL); | 527 | return_PTR(NULL); |
534 | } | 528 | } |
535 | } | 529 | } |
@@ -745,8 +739,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block) | |||
745 | sizeof(struct | 739 | sizeof(struct |
746 | acpi_gpe_register_info)); | 740 | acpi_gpe_register_info)); |
747 | if (!gpe_register_info) { | 741 | if (!gpe_register_info) { |
748 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 742 | ACPI_REPORT_ERROR(("Could not allocate the gpe_register_info table\n")); |
749 | "Could not allocate the gpe_register_info table\n")); | ||
750 | return_ACPI_STATUS(AE_NO_MEMORY); | 743 | return_ACPI_STATUS(AE_NO_MEMORY); |
751 | } | 744 | } |
752 | 745 | ||
@@ -759,8 +752,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block) | |||
759 | ACPI_GPE_REGISTER_WIDTH) * | 752 | ACPI_GPE_REGISTER_WIDTH) * |
760 | sizeof(struct acpi_gpe_event_info)); | 753 | sizeof(struct acpi_gpe_event_info)); |
761 | if (!gpe_event_info) { | 754 | if (!gpe_event_info) { |
762 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 755 | ACPI_REPORT_ERROR(("Could not allocate the gpe_event_info table\n")); |
763 | "Could not allocate the gpe_event_info table\n")); | ||
764 | status = AE_NO_MEMORY; | 756 | status = AE_NO_MEMORY; |
765 | goto error_exit; | 757 | goto error_exit; |
766 | } | 758 | } |