1 files changed, 28 insertions, 35 deletions
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index 84fad082d80d..6da58e776413 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -295,12 +295,12 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
        handler_desc = region_obj->region.handler;
        if (!handler_desc) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_ERROR((AE_INFO,
-                                  "No handler for Region [%4.4s] (%p) [%s]\n",
+                            "No handler for Region [%4.4s] (%p) [%s]",
-                                  acpi_ut_get_node_name(region_obj->region.
+                            acpi_ut_get_node_name(region_obj->region.node),
-                                                        node), region_obj,
+                            region_obj,
-                                  acpi_ut_get_region_name(region_obj->region.
+                            acpi_ut_get_region_name(region_obj->region.
-                                                          space_id)));
+                                                    space_id)));
                return_ACPI_STATUS(AE_NOT_EXIST);
        }
@@ -317,12 +317,11 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                if (!region_setup) {
                        /* No initialization routine, exit with error */
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_ERROR((AE_INFO,
-                                          "No init routine for region(%p) [%s]\n",
+                                    "No init routine for region(%p) [%s]",
-                                          region_obj,
+                                    region_obj,
-                                          acpi_ut_get_region_name(region_obj->
+                                    acpi_ut_get_region_name(region_obj->region.
-                                                                  region.
+                                                            space_id)));
-                                                                  space_id)));
                        return_ACPI_STATUS(AE_NOT_EXIST);
                }
@@ -347,12 +346,11 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                /* Check for failure of the Region Setup */
                if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_EXCEPTION((AE_INFO, status,
-                                          "Region Init: %s [%s]\n",
+                                        "During region initialization: [%s]",
-                                          acpi_format_exception(status),
+                                        acpi_ut_get_region_name(region_obj->
-                                          acpi_ut_get_region_name(region_obj->
+                                                                region.
-                                                                  region.
+                                                                space_id)));
-                                                                  space_id)));
                        return_ACPI_STATUS(status);
                }
@@ -406,10 +404,9 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                         region_obj2->extra.region_context);
        if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Handler for [%s] returned %s\n",
+                ACPI_EXCEPTION((AE_INFO, status, "Returned by Handler for [%s]",
-                                   acpi_ut_get_region_name(region_obj->region.
+                                acpi_ut_get_region_name(region_obj->region.
-                                                           space_id),
+                                                        space_id)));
-                                   acpi_format_exception(status)));
        }
        if (!
@@ -501,12 +498,10 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
                        status = acpi_ev_execute_reg_method(region_obj, 0);
                        if (ACPI_FAILURE(status)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                ACPI_EXCEPTION((AE_INFO, status,
-                                                  "%s from region _REG, [%s]\n",
+                                                "from region _REG, [%s]",
-                                                  acpi_format_exception(status),
+                                                acpi_ut_get_region_name
-                                                  acpi_ut_get_region_name
+                                                (region_obj->region.space_id)));
-                                                  (region_obj->region.
-                                                   space_id)));
                        }
                        if (acpi_ns_is_locked) {
@@ -528,12 +523,10 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
                        /* Init routine may fail, Just ignore errors */
                        if (ACPI_FAILURE(status)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                ACPI_EXCEPTION((AE_INFO, status,
-                                                  "%s from region init, [%s]\n",
+                                                "from region init, [%s]",
-                                                  acpi_format_exception(status),
+                                                acpi_ut_get_region_name
-                                                  acpi_ut_get_region_name
+                                                (region_obj->region.space_id)));
-                                                  (region_obj->region.
-                                                   space_id)));
                        }
                        region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE);

diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c index 84fad082d80d..6da58e776413 100644 --- a/drivers/acpi/events/evregion.c +++ b/drivers/acpi/events/evregion.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
@@ -295,12 +295,12 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
295		295
296	handler_desc = region_obj->region.handler;	296	handler_desc = region_obj->region.handler;
297	if (!handler_desc) {	297	if (!handler_desc) {
298	ACPI_DEBUG_PRINT((ACPI_DB_ERROR,	298	ACPI_ERROR((AE_INFO,
299	"No handler for Region [%4.4s] (%p) [%s]\n",	299	"No handler for Region [%4.4s] (%p) [%s]",
300	acpi_ut_get_node_name(region_obj->region.	300	acpi_ut_get_node_name(region_obj->region.node),
301	node), region_obj,	301	region_obj,
302	acpi_ut_get_region_name(region_obj->region.	302	acpi_ut_get_region_name(region_obj->region.
303	space_id)));	303	space_id)));
304		304
305	return_ACPI_STATUS(AE_NOT_EXIST);	305	return_ACPI_STATUS(AE_NOT_EXIST);
306	}	306	}
@@ -317,12 +317,11 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
317	if (!region_setup) {	317	if (!region_setup) {
318	/* No initialization routine, exit with error */	318	/* No initialization routine, exit with error */
319		319
320	ACPI_DEBUG_PRINT((ACPI_DB_ERROR,	320	ACPI_ERROR((AE_INFO,
321	"No init routine for region(%p) [%s]\n",	321	"No init routine for region(%p) [%s]",
322	region_obj,	322	region_obj,
323	acpi_ut_get_region_name(region_obj->	323	acpi_ut_get_region_name(region_obj->region.
324	region.	324	space_id)));
325	space_id)));
326	return_ACPI_STATUS(AE_NOT_EXIST);	325	return_ACPI_STATUS(AE_NOT_EXIST);
327	}	326	}
328		327
@@ -347,12 +346,11 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
347	/* Check for failure of the Region Setup */	346	/* Check for failure of the Region Setup */
348		347
349	if (ACPI_FAILURE(status)) {	348	if (ACPI_FAILURE(status)) {
350	ACPI_DEBUG_PRINT((ACPI_DB_ERROR,	349	ACPI_EXCEPTION((AE_INFO, status,
351	"Region Init: %s [%s]\n",	350	"During region initialization: [%s]",
352	acpi_format_exception(status),	351	acpi_ut_get_region_name(region_obj->
353	acpi_ut_get_region_name(region_obj->	352	region.
354	region.	353	space_id)));
355	space_id)));
356	return_ACPI_STATUS(status);	354	return_ACPI_STATUS(status);
357	}	355	}
358		356
@@ -406,10 +404,9 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
406	region_obj2->extra.region_context);	404	region_obj2->extra.region_context);
407		405
408	if (ACPI_FAILURE(status)) {	406	if (ACPI_FAILURE(status)) {
409	ACPI_REPORT_ERROR(("Handler for [%s] returned %s\n",	407	ACPI_EXCEPTION((AE_INFO, status, "Returned by Handler for [%s]",
410	acpi_ut_get_region_name(region_obj->region.	408	acpi_ut_get_region_name(region_obj->region.
411	space_id),	409	space_id)));
412	acpi_format_exception(status)));
413	}	410	}
414		411
415	if (!	412	if (!
@@ -501,12 +498,10 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
501		498
502	status = acpi_ev_execute_reg_method(region_obj, 0);	499	status = acpi_ev_execute_reg_method(region_obj, 0);
503	if (ACPI_FAILURE(status)) {	500	if (ACPI_FAILURE(status)) {
504	ACPI_DEBUG_PRINT((ACPI_DB_ERROR,	501	ACPI_EXCEPTION((AE_INFO, status,
505	"%s from region _REG, [%s]\n",	502	"from region _REG, [%s]",
506	acpi_format_exception(status),	503	acpi_ut_get_region_name
507	acpi_ut_get_region_name	504	(region_obj->region.space_id)));
508	(region_obj->region.
509	space_id)));
510	}	505	}
511		506
512	if (acpi_ns_is_locked) {	507	if (acpi_ns_is_locked) {
@@ -528,12 +523,10 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
528	/* Init routine may fail, Just ignore errors */	523	/* Init routine may fail, Just ignore errors */
529		524
530	if (ACPI_FAILURE(status)) {	525	if (ACPI_FAILURE(status)) {
531	ACPI_DEBUG_PRINT((ACPI_DB_ERROR,	526	ACPI_EXCEPTION((AE_INFO, status,
532	"%s from region init, [%s]\n",	527	"from region init, [%s]",
533	acpi_format_exception(status),	528	acpi_ut_get_region_name
534	acpi_ut_get_region_name	529	(region_obj->region.space_id)));
535	(region_obj->region.
536	space_id)));
537	}	530	}
538		531
539	region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE);	532	region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE);