diff options
Diffstat (limited to 'drivers/acpi/events/evxface.c')
-rw-r--r-- | drivers/acpi/events/evxface.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c index 57d73299298e..b2f69b1ac4b5 100644 --- a/drivers/acpi/events/evxface.c +++ b/drivers/acpi/events/evxface.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 |
@@ -143,8 +143,8 @@ acpi_install_fixed_event_handler(u32 event, | |||
143 | if (ACPI_SUCCESS(status)) | 143 | if (ACPI_SUCCESS(status)) |
144 | status = acpi_enable_event(event, 0); | 144 | status = acpi_enable_event(event, 0); |
145 | if (ACPI_FAILURE(status)) { | 145 | if (ACPI_FAILURE(status)) { |
146 | ACPI_DEBUG_PRINT((ACPI_DB_WARN, | 146 | ACPI_REPORT_WARNING(("Could not enable fixed event %X\n", |
147 | "Could not enable fixed event.\n")); | 147 | event)); |
148 | 148 | ||
149 | /* Remove the handler */ | 149 | /* Remove the handler */ |
150 | 150 | ||
@@ -204,10 +204,9 @@ acpi_remove_fixed_event_handler(u32 event, acpi_event_handler handler) | |||
204 | acpi_gbl_fixed_event_handlers[event].context = NULL; | 204 | acpi_gbl_fixed_event_handlers[event].context = NULL; |
205 | 205 | ||
206 | if (ACPI_FAILURE(status)) { | 206 | if (ACPI_FAILURE(status)) { |
207 | ACPI_DEBUG_PRINT((ACPI_DB_WARN, | 207 | ACPI_REPORT_WARNING(("Could not write to fixed event enable register %X\n", event)); |
208 | "Could not write to fixed event enable register.\n")); | ||
209 | } else { | 208 | } else { |
210 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Disabled fixed event %X.\n", | 209 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Disabled fixed event %X\n", |
211 | event)); | 210 | event)); |
212 | } | 211 | } |
213 | 212 | ||
@@ -434,7 +433,7 @@ acpi_remove_notify_handler(acpi_handle device, | |||
434 | 433 | ||
435 | if (device == ACPI_ROOT_OBJECT) { | 434 | if (device == ACPI_ROOT_OBJECT) { |
436 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 435 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
437 | "Removing notify handler for ROOT object.\n")); | 436 | "Removing notify handler for namespace root object\n")); |
438 | 437 | ||
439 | if (((handler_type & ACPI_SYSTEM_NOTIFY) && | 438 | if (((handler_type & ACPI_SYSTEM_NOTIFY) && |
440 | !acpi_gbl_system_notify.handler) || | 439 | !acpi_gbl_system_notify.handler) || |