diff options
Diffstat (limited to 'drivers/acpi/acpica/pstree.c')
| -rw-r--r-- | drivers/acpi/acpica/pstree.c | 24 | 
1 files changed, 16 insertions, 8 deletions
diff --git a/drivers/acpi/acpica/pstree.c b/drivers/acpi/acpica/pstree.c index d4b970c3630..0b64181e772 100644 --- a/drivers/acpi/acpica/pstree.c +++ b/drivers/acpi/acpica/pstree.c @@ -5,7 +5,7 @@   *****************************************************************************/  /* - * Copyright (C) 2000 - 2010, Intel Corp. + * Copyright (C) 2000 - 2014, Intel Corp.   * All rights reserved.   *   * Redistribution and use in source and binary forms, with or without @@ -58,8 +58,8 @@ union acpi_parse_object *acpi_ps_get_child(union acpi_parse_object *op);   *   * FUNCTION:    acpi_ps_get_arg   * - * PARAMETERS:  Op              - Get an argument for this op - *              Argn            - Nth argument to get + * PARAMETERS:  op              - Get an argument for this op + *              argn            - Nth argument to get   *   * RETURN:      The argument (as an Op object). NULL if argument does not exist   * @@ -74,6 +74,12 @@ union acpi_parse_object *acpi_ps_get_arg(union acpi_parse_object *op, u32 argn)  	ACPI_FUNCTION_ENTRY(); +/* +	if (Op->Common.aml_opcode == AML_INT_CONNECTION_OP) +	{ +		return (Op->Common.Value.Arg); +	} +*/  	/* Get the info structure for this opcode */  	op_info = acpi_ps_get_opcode_info(op->common.aml_opcode); @@ -108,8 +114,8 @@ union acpi_parse_object *acpi_ps_get_arg(union acpi_parse_object *op, u32 argn)   *   * FUNCTION:    acpi_ps_append_arg   * - * PARAMETERS:  Op              - Append an argument to this Op. - *              Arg             - Argument Op to append + * PARAMETERS:  op              - Append an argument to this Op. + *              arg             - Argument Op to append   *   * RETURN:      None.   * @@ -182,8 +188,8 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)   *   * FUNCTION:    acpi_ps_get_depth_next   * - * PARAMETERS:  Origin          - Root of subtree to search - *              Op              - Last (previous) Op that was found + * PARAMETERS:  origin          - Root of subtree to search + *              op              - Last (previous) Op that was found   *   * RETURN:      Next Op found in the search.   * @@ -255,7 +261,7 @@ union acpi_parse_object *acpi_ps_get_depth_next(union acpi_parse_object *origin,   *   * FUNCTION:    acpi_ps_get_child   * - * PARAMETERS:  Op              - Get the child of this Op + * PARAMETERS:  op              - Get the child of this Op   *   * RETURN:      Child Op, Null if none is found.   * @@ -302,7 +308,9 @@ union acpi_parse_object *acpi_ps_get_child(union acpi_parse_object *op)  		break;  	default: +  		/* All others have no children */ +  		break;  	}  | 
