ACPICA: Fix two additional Scope override error messages
authorBob Moore <robert.moore@intel.com>
Fri, 11 Dec 2009 06:40:17 +0000 (14:40 +0800)
committerLen Brown <len.brown@intel.com>
Tue, 15 Dec 2009 22:29:35 +0000 (17:29 -0500)
These messages were using the internal path for the message
instead of using the node name.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/acpica/dswload.c

index 1bab934e99f8d54d6f9b057bbfdb70ef8439b837..9cc2289f872e0a10b45789372abf49fa97c90766 100644 (file)
@@ -700,15 +700,16 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                case ACPI_TYPE_BUFFER:
 
                        /*
-                        * These types we will allow, but we will change the type. This
-                        * enables some existing code of the form:
+                        * These types we will allow, but we will change the type.
+                        * This enables some existing code of the form:
                         *
                         *  Name (DEB, 0)
                         *  Scope (DEB) { ... }
                         */
                        ACPI_WARNING((AE_INFO,
-                                     "Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)",
-                                     buffer_ptr,
+                                     "Type override - [%4.4s] had invalid type (%s) "
+                                     "for Scope operator, changed to type ANY\n",
+                                     acpi_ut_get_node_name(node),
                                      acpi_ut_get_type_name(node->type)));
 
                        node->type = ACPI_TYPE_ANY;
@@ -720,9 +721,10 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                        /* All other types are an error */
 
                        ACPI_ERROR((AE_INFO,
-                                   "Invalid type (%s) for target of Scope operator [%4.4s]",
+                                   "Invalid type (%s) for target of "
+                                   "Scope operator [%4.4s] (Cannot override)",
                                    acpi_ut_get_type_name(node->type),
-                                   buffer_ptr));
+                                   acpi_ut_get_node_name(node)));
 
                        return (AE_AML_OPERAND_TYPE);
                }