Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 336648
b: refs/heads/master
c: 73a3090
h: refs/heads/master
v: v3
  • Loading branch information
Bob Moore authored and Rafael J. Wysocki committed Nov 14, 2012
1 parent 078afc7 commit 57a36a7
Show file tree
Hide file tree
Showing 62 changed files with 189 additions and 189 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b9e17693576e4739cd267f59cbdfdd33c5eefe76
refs/heads/master: 73a3090a2160fb01317f5a44af6ee5a064a29625
2 changes: 1 addition & 1 deletion trunk/drivers/acpi/acpica/acglobal.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@

/*
* Enable "slack" in the AML interpreter? Default is FALSE, and the
* interpreter strictly follows the ACPI specification. Setting to TRUE
* interpreter strictly follows the ACPI specification. Setting to TRUE
* allows the interpreter to ignore certain errors and/or bad AML constructs.
*
* Currently, these features are enabled by this flag:
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/acpi/acpica/aclocal.h
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ typedef
acpi_status(*acpi_internal_method) (struct acpi_walk_state * walk_state);

/*
* Bitmapped ACPI types. Used internally only
* Bitmapped ACPI types. Used internally only
*/
#define ACPI_BTYPE_ANY 0x00000000
#define ACPI_BTYPE_INTEGER 0x00000001
Expand Down Expand Up @@ -584,7 +584,7 @@ struct acpi_pscope_state {
};

/*
* Thread state - one per thread across multiple walk states. Multiple walk
* Thread state - one per thread across multiple walk states. Multiple walk
* states are created when there are nested control methods executing.
*/
struct acpi_thread_state {
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/acpi/acpica/acobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ struct acpi_object_method {

/******************************************************************************
*
* Objects that can be notified. All share a common notify_info area.
* Objects that can be notified. All share a common notify_info area.
*
*****************************************************************************/

Expand Down Expand Up @@ -234,7 +234,7 @@ ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_NOTIFY_INFO};

/******************************************************************************
*
* Fields. All share a common header/info field.
* Fields. All share a common header/info field.
*
*****************************************************************************/

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/acpi/acpica/acopcode.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
#define _UNK 0x6B

/*
* Reserved ASCII characters. Do not use any of these for
* Reserved ASCII characters. Do not use any of these for
* internal opcodes, since they are used to differentiate
* name strings from AML opcodes
*/
Expand All @@ -63,7 +63,7 @@
#define _PFX 0x6D

/*
* All AML opcodes and the parse-time arguments for each. Used by the AML
* All AML opcodes and the parse-time arguments for each. Used by the AML
* parser Each list is compressed into a 32-bit number and stored in the
* master opcode table (in psopcode.c).
*/
Expand Down Expand Up @@ -193,7 +193,7 @@
#define ARGP_ZERO_OP ARG_NONE

/*
* All AML opcodes and the runtime arguments for each. Used by the AML
* All AML opcodes and the runtime arguments for each. Used by the AML
* interpreter Each list is compressed into a 32-bit number and stored
* in the master opcode table (in psopcode.c).
*
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/acpi/acpica/acstruct.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
****************************************************************************/

/*
* Walk state - current state of a parse tree walk. Used for both a leisurely
* Walk state - current state of a parse tree walk. Used for both a leisurely
* stroll through the tree (for whatever reason), and for control method
* execution.
*/
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/acpi/acpica/dscontrol.c
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,

/*
* Get the return value and save as the last result
* value. This is the only place where walk_state->return_desc
* value. This is the only place where walk_state->return_desc
* is set to anything other than zero!
*/
walk_state->return_desc = walk_state->operands[0];
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/acpi/acpica/dsfield.c
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
*
* RETURN: Status
*
* DESCRIPTION: Process all named fields in a field declaration. Names are
* DESCRIPTION: Process all named fields in a field declaration. Names are
* entered into the namespace.
*
******************************************************************************/
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/acpi/acpica/dsmethod.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ acpi_ds_create_method_mutex(union acpi_operand_object *method_desc)
*
* RETURN: Status
*
* DESCRIPTION: Prepare a method for execution. Parses the method if necessary,
* DESCRIPTION: Prepare a method for execution. Parses the method if necessary,
* increments the thread count, and waits at the method semaphore
* for clearance to execute.
*
Expand Down Expand Up @@ -444,7 +444,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
* RETURN: Status
*
* DESCRIPTION: Restart a method that was preempted by another (nested) method
* invocation. Handle the return value (if any) from the callee.
* invocation. Handle the return value (if any) from the callee.
*
******************************************************************************/

Expand Down Expand Up @@ -530,7 +530,7 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state,
*
* RETURN: None
*
* DESCRIPTION: Terminate a control method. Delete everything that the method
* DESCRIPTION: Terminate a control method. Delete everything that the method
* created, delete all locals and arguments, and delete the parse
* tree if requested.
*
Expand Down
14 changes: 7 additions & 7 deletions trunk/drivers/acpi/acpica/dsmthdat.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ acpi_ds_method_data_get_type(u16 opcode,
* RETURN: Status
*
* DESCRIPTION: Initialize the data structures that hold the method's arguments
* and locals. The data struct is an array of namespace nodes for
* and locals. The data struct is an array of namespace nodes for
* each - this allows ref_of and de_ref_of to work properly for these
* special data types.
*
Expand Down Expand Up @@ -129,7 +129,7 @@ void acpi_ds_method_data_init(struct acpi_walk_state *walk_state)
*
* RETURN: None
*
* DESCRIPTION: Delete method locals and arguments. Arguments are only
* DESCRIPTION: Delete method locals and arguments. Arguments are only
* deleted if this method was called from another method.
*
******************************************************************************/
Expand Down Expand Up @@ -183,7 +183,7 @@ void acpi_ds_method_data_delete_all(struct acpi_walk_state *walk_state)
*
* RETURN: Status
*
* DESCRIPTION: Initialize arguments for a method. The parameter list is a list
* DESCRIPTION: Initialize arguments for a method. The parameter list is a list
* of ACPI operand objects, either null terminated or whose length
* is defined by max_param_count.
*
Expand Down Expand Up @@ -401,7 +401,7 @@ acpi_ds_method_data_get_value(u8 type,
* This means that either 1) The expected argument was
* not passed to the method, or 2) A local variable
* was referenced by the method (via the ASL)
* before it was initialized. Either case is an error.
* before it was initialized. Either case is an error.
*/

/* If slack enabled, init the local_x/arg_x to an Integer of value zero */
Expand Down Expand Up @@ -465,7 +465,7 @@ acpi_ds_method_data_get_value(u8 type,
*
* RETURN: None
*
* DESCRIPTION: Delete the entry at Opcode:Index. Inserts
* DESCRIPTION: Delete the entry at Opcode:Index. Inserts
* a null into the stack slot after the object is deleted.
*
******************************************************************************/
Expand Down Expand Up @@ -523,7 +523,7 @@ acpi_ds_method_data_delete_value(u8 type,
*
* RETURN: Status
*
* DESCRIPTION: Store a value in an Arg or Local. The obj_desc is installed
* DESCRIPTION: Store a value in an Arg or Local. The obj_desc is installed
* as the new value for the Arg or Local and the reference count
* for obj_desc is incremented.
*
Expand Down Expand Up @@ -566,7 +566,7 @@ acpi_ds_store_object_to_local(u8 type,

/*
* If the reference count on the object is more than one, we must
* take a copy of the object before we store. A reference count
* take a copy of the object before we store. A reference count
* of exactly 1 means that the object was just created during the
* evaluation of an expression, and we can safely use it since it
* is not used anywhere else.
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/acpi/acpica/dsobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,

/*
* Second arg is the buffer data (optional) byte_list can be either
* individual bytes or a string initializer. In either case, a
* individual bytes or a string initializer. In either case, a
* byte_list appears in the AML.
*/
arg = op->common.value.arg; /* skip first arg */
Expand Down Expand Up @@ -568,7 +568,7 @@ acpi_ds_create_node(struct acpi_walk_state *walk_state,

/*
* Because of the execution pass through the non-control-method
* parts of the table, we can arrive here twice. Only init
* parts of the table, we can arrive here twice. Only init
* the named object node the first time through
*/
if (acpi_ns_get_attached_object(node)) {
Expand Down Expand Up @@ -618,7 +618,7 @@ acpi_ds_create_node(struct acpi_walk_state *walk_state,
* RETURN: Status
*
* DESCRIPTION: Initialize a namespace object from a parser Op and its
* associated arguments. The namespace object is a more compact
* associated arguments. The namespace object is a more compact
* representation of the Op and its arguments.
*
******************************************************************************/
Expand Down
30 changes: 15 additions & 15 deletions trunk/drivers/acpi/acpica/dsutils.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ ACPI_MODULE_NAME("dsutils")
*
* RETURN: None.
*
* DESCRIPTION: Clear and remove a reference on an implicit return value. Used
* DESCRIPTION: Clear and remove a reference on an implicit return value. Used
* to delete "stale" return values (if enabled, the return value
* from every operator is saved at least momentarily, in case the
* parent method exits.)
Expand Down Expand Up @@ -107,7 +107,7 @@ void acpi_ds_clear_implicit_return(struct acpi_walk_state *walk_state)
*
* DESCRIPTION: Implements the optional "implicit return". We save the result
* of every ASL operator and control method invocation in case the
* parent method exit. Before storing a new return value, we
* parent method exit. Before storing a new return value, we
* delete the previous return value.
*
******************************************************************************/
Expand Down Expand Up @@ -198,7 +198,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
*
* If there is no parent, or the parent is a scope_op, we are executing
* at the method level. An executing method typically has no parent,
* since each method is parsed separately. A method invoked externally
* since each method is parsed separately. A method invoked externally
* via execute_control_method has a scope_op as the parent.
*/
if ((!op->common.parent) ||
Expand All @@ -223,7 +223,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
}

/*
* Decide what to do with the result based on the parent. If
* Decide what to do with the result based on the parent. If
* the parent opcode will not use the result, delete the object.
* Otherwise leave it as is, it will be deleted when it is used
* as an operand later.
Expand Down Expand Up @@ -266,7 +266,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,

/*
* These opcodes allow term_arg(s) as operands and therefore
* the operands can be method calls. The result is used.
* the operands can be method calls. The result is used.
*/
goto result_used;

Expand All @@ -284,7 +284,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
AML_BANK_FIELD_OP)) {
/*
* These opcodes allow term_arg(s) as operands and therefore
* the operands can be method calls. The result is used.
* the operands can be method calls. The result is used.
*/
goto result_used;
}
Expand Down Expand Up @@ -329,9 +329,9 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
*
* RETURN: Status
*
* DESCRIPTION: Used after interpretation of an opcode. If there is an internal
* DESCRIPTION: Used after interpretation of an opcode. If there is an internal
* result descriptor, check if the parent opcode will actually use
* this result. If not, delete the result now so that it will
* this result. If not, delete the result now so that it will
* not become orphaned.
*
******************************************************************************/
Expand Down Expand Up @@ -376,7 +376,7 @@ acpi_ds_delete_result_if_not_used(union acpi_parse_object *op,
*
* RETURN: Status
*
* DESCRIPTION: Resolve all operands to their values. Used to prepare
* DESCRIPTION: Resolve all operands to their values. Used to prepare
* arguments to a control method invocation (a call from one
* method to another.)
*
Expand All @@ -391,7 +391,7 @@ acpi_status acpi_ds_resolve_operands(struct acpi_walk_state *walk_state)

/*
* Attempt to resolve each of the valid operands
* Method arguments are passed by reference, not by value. This means
* Method arguments are passed by reference, not by value. This means
* that the actual objects are passed, not copies of the objects.
*/
for (i = 0; i < walk_state->num_operands; i++) {
Expand Down Expand Up @@ -451,7 +451,7 @@ void acpi_ds_clear_operands(struct acpi_walk_state *walk_state)
* RETURN: Status
*
* DESCRIPTION: Translate a parse tree object that is an argument to an AML
* opcode to the equivalent interpreter object. This may include
* opcode to the equivalent interpreter object. This may include
* looking up a name or entering a new name into the internal
* namespace.
*
Expand Down Expand Up @@ -496,9 +496,9 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
/*
* Special handling for buffer_field declarations. This is a deferred
* opcode that unfortunately defines the field name as the last
* parameter instead of the first. We get here when we are performing
* parameter instead of the first. We get here when we are performing
* the deferred execution, so the actual name of the field is already
* in the namespace. We don't want to attempt to look it up again
* in the namespace. We don't want to attempt to look it up again
* because we may be executing in a different scope than where the
* actual opcode exists.
*/
Expand Down Expand Up @@ -605,8 +605,8 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
/*
* If the name is null, this means that this is an
* optional result parameter that was not specified
* in the original ASL. Create a Zero Constant for a
* placeholder. (Store to a constant is a Noop.)
* in the original ASL. Create a Zero Constant for a
* placeholder. (Store to a constant is a Noop.)
*/
opcode = AML_ZERO_OP; /* Has no arguments! */

Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/acpi/acpica/dswexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
* RETURN: Status
*
* DESCRIPTION: Descending callback used during the execution of control
* methods. This is where most operators and operands are
* methods. This is where most operators and operands are
* dispatched to the interpreter.
*
****************************************************************************/
Expand Down Expand Up @@ -297,7 +297,7 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
if (walk_state->walk_type & ACPI_WALK_METHOD) {
/*
* Found a named object declaration during method execution;
* we must enter this object into the namespace. The created
* we must enter this object into the namespace. The created
* object is temporary and will be deleted upon completion of
* the execution of this method.
*
Expand Down Expand Up @@ -348,7 +348,7 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
* RETURN: Status
*
* DESCRIPTION: Ascending callback used during the execution of control
* methods. The only thing we really need to do here is to
* methods. The only thing we really need to do here is to
* notice the beginning of IF, ELSE, and WHILE blocks.
*
****************************************************************************/
Expand Down Expand Up @@ -432,7 +432,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
if (ACPI_SUCCESS(status)) {
/*
* Dispatch the request to the appropriate interpreter handler
* routine. There is one routine per opcode "type" based upon the
* routine. There is one routine per opcode "type" based upon the
* number of opcode arguments and return type.
*/
status =
Expand Down
Loading

0 comments on commit 57a36a7

Please sign in to comment.