Pull novell-bugzilla-156426 into release branch

[pandora-kernel.git] / drivers / acpi / parser / pstree.c

diff --git a/drivers/acpi/parser/pstree.c b/drivers/acpi/parser/pstree.c
index f0e7558..0015717 100644 (file)
--- a/drivers/acpi/parser/pstree.c
+++ b/drivers/acpi/parser/pstree.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
@@ -77,6 +77,7 @@ union acpi_parse_object *acpi_ps_get_arg(union acpi_parse_object *op, u32 argn)
 
        op_info = acpi_ps_get_opcode_info(op->common.aml_opcode);
        if (op_info->class == AML_CLASS_UNKNOWN) {
+
                /* Invalid opcode or ASCII character */
 
                return (NULL);
@@ -85,6 +86,7 @@ union acpi_parse_object *acpi_ps_get_arg(union acpi_parse_object *op, u32 argn)
        /* Check if this opcode requires argument sub-objects */
 
        if (!(op_info->flags & AML_HAS_ARGS)) {
+
                /* Has no linked argument objects */
 
                return (NULL);
@@ -130,15 +132,18 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)
 
        op_info = acpi_ps_get_opcode_info(op->common.aml_opcode);
        if (op_info->class == AML_CLASS_UNKNOWN) {
+
                /* Invalid opcode */
 
-               ACPI_REPORT_ERROR(("ps_append_arg: Invalid AML Opcode: 0x%2.2X\n", op->common.aml_opcode));
+               ACPI_ERROR((AE_INFO, "Invalid AML Opcode: 0x%2.2X",
+                           op->common.aml_opcode));
                return;
        }
 
        /* Check if this opcode requires argument sub-objects */
 
        if (!(op_info->flags & AML_HAS_ARGS)) {
+
                /* Has no linked argument objects */
 
                return;
@@ -147,6 +152,7 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)
        /* Append the argument to the linked argument list */
 
        if (op->common.value.arg) {
+
                /* Append to existing argument list */
 
                prev_arg = op->common.value.arg;
@@ -221,12 +227,14 @@ union acpi_parse_object *acpi_ps_get_depth_next(union acpi_parse_object *origin,
                }
 
                if (arg == origin) {
+
                        /* Reached parent of origin, end search */
 
                        return (NULL);
                }
 
                if (parent->common.next) {
+
                        /* Found sibling of parent */
 
                        return (parent->common.next);
@@ -298,5 +306,4 @@ union acpi_parse_object *acpi_ps_get_child(union acpi_parse_object *op)
        return (child);
 }
 #endif
-
 #endif                         /*  ACPI_FUTURE_USAGE  */