Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75c8044f authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Cleanup updated comments. 



This is a cosmetic patch only. Comparison of the resulting binary showed
only line number differences.

This patch does not affect the generation of the Linux binary.
This patch decreases 558 lines of 20121018 divergence.diff.

This patch reduces the source code diff between Linux and ACPICA by
cleaning the comments that already have been updated in ACPICA.

There is no extra indentation done in this patch. Even the empty line
deletions and insertions are also splitted into another cleanup patch so
that this patch can be easily reviewed, and the binary differences can be
held to a lowest level.

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 9931faca

drivers/acpi/acpica/aclocal.h

+9 −5
Original line number Diff line number Diff line
@@ -189,11 +189,10 @@ struct acpi_namespace_node { 
#define ANOBJ_EVALUATED                 0x20	/* Set on first evaluation of node */

#define ANOBJ_ALLOCATED_BUFFER          0x40	/* Method AML buffer is dynamic (install_method) */



#define ANOBJ_IS_EXTERNAL               0x08	/* i_aSL only: This object created via External() */

#define ANOBJ_METHOD_NO_RETVAL          0x10	/* i_aSL only: Method has no return value */

#define ANOBJ_METHOD_SOME_NO_RETVAL     0x20	/* i_aSL only: Method has at least one return value */

#define ANOBJ_IS_BIT_OFFSET             0x40	/* i_aSL only: Reference is a bit offset */

#define ANOBJ_IS_REFERENCED             0x80	/* i_aSL only: Object was referenced */

#define ANOBJ_IS_EXTERNAL               0x08	/* iASL only: This object created via External() */

#define ANOBJ_METHOD_NO_RETVAL          0x10	/* iASL only: Method has no return value */

#define ANOBJ_METHOD_SOME_NO_RETVAL     0x20	/* iASL only: Method has at least one return value */

#define ANOBJ_IS_REFERENCED             0x80	/* iASL only: Object was referenced */



/* Internal ACPI table management - master table list */
@@ -416,6 +415,10 @@ struct acpi_gpe_notify_object { 
	struct acpi_gpe_notify_object *next;

};



/*

 * GPE dispatch info. At any time, the GPE can have at most one type

 * of dispatch - Method, Handler, or Implicit Notify.

 */

union acpi_gpe_dispatch_info {

	struct acpi_namespace_node *method_node;	/* Method node for this GPE level */

	struct acpi_gpe_handler_info *handler;  /* Installed GPE handler */
@@ -679,6 +682,7 @@ struct acpi_opcode_info { 
	u8 type;		/* Opcode type */

};



/* Value associated with the parse object */

union acpi_parse_value {

	u64 integer;		/* Integer constant (Up to 64 bits) */

	u32 size;		/* bytelist or field size */

drivers/acpi/acpica/acobject.h

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ struct acpi_object_addr_handler { 
	struct acpi_namespace_node *node;	/* Parent device */

	void *context;

	acpi_adr_space_setup setup;

	union acpi_operand_object *region_list;	/* regions using this handler */

	union acpi_operand_object *region_list;	/* Regions using this handler */

	union acpi_operand_object *next;

};

drivers/acpi/acpica/acpredef.h

+8 −6
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * Name: acpredef - Information table for ACPI predefined methods and objects

 *              $Revision: 1.1 $

 *

 *****************************************************************************/
@@ -51,13 +50,13 @@ 
 *

 * 1) PTYPE1 packages do not contain sub-packages.

 *

 * ACPI_PTYPE1_FIXED: Fixed length, 1 or 2 object types:

 * ACPI_PTYPE1_FIXED: Fixed-length length, 1 or 2 object types:

 *      object type

 *      count

 *      object type

 *      count

 *

 * ACPI_PTYPE1_VAR: Variable length:

 * ACPI_PTYPE1_VAR: Variable-length length:

 *      object type (Int/Buf/Ref)

 *

 * ACPI_PTYPE1_OPTION: Package has some required and some optional elements
@@ -85,10 +84,10 @@ 
 *      count

 *      (Used for _CST)

 *

 * ACPI_PTYPE2_FIXED: Each subpackage is of fixed length

 * ACPI_PTYPE2_FIXED: Each subpackage is of Fixed-length

 *      (Used for _PRT)

 *

 * ACPI_PTYPE2_MIN: Each subpackage has a variable but minimum length

 * ACPI_PTYPE2_MIN: Each subpackage has a Variable-length but minimum length

 *      (Used for _HPX)

 *

 * ACPI_PTYPE2_REV_FIXED: Revision at start, each subpackage is Fixed-length
@@ -124,7 +123,8 @@ enum acpi_return_package_types { 
 * These are the names that can actually be evaluated via acpi_evaluate_object.

 * Not present in this table are the following:

 *

 *      1) Predefined/Reserved names that are never evaluated via acpi_evaluate_object:

 *      1) Predefined/Reserved names that are never evaluated via

 *         acpi_evaluate_object:

 *          _Lxx and _Exx GPE methods

 *          _Qxx EC methods

 *          _T_x compiler temporary variables
@@ -149,6 +149,8 @@ enum acpi_return_package_types { 
 * information about the expected structure of the package. This information

 * is saved here (rather than in a separate table) in order to minimize the

 * overall size of the stored data.

 *

 * Note: The additional braces are intended to promote portability.

 */

static const union acpi_predefined_info predefined_names[] = {

	{{"_AC0", 0, ACPI_RTYPE_INTEGER}},

drivers/acpi/acpica/dsopcode.c

+7 −7
Original line number Diff line number Diff line
@@ -486,18 +486,18 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state, 
	ACPI_FUNCTION_TRACE_PTR(ds_eval_table_region_operands, op);



	/*

	 * This is where we evaluate the signature_string and oem_iDString

	 * and oem_table_iDString of the data_table_region declaration

	 * This is where we evaluate the Signature string, oem_id string,

	 * and oem_table_id string of the Data Table Region declaration

	 */

	node = op->common.node;



	/* next_op points to signature_string op */

	/* next_op points to Signature string op */



	next_op = op->common.value.arg;



	/*

	 * Evaluate/create the signature_string and oem_iDString

	 * and oem_table_iDString operands

	 * Evaluate/create the Signature string, oem_id string,

	 * and oem_table_id string operands

	 */

	status = acpi_ds_create_operands(walk_state, next_op);

	if (ACPI_FAILURE(status)) {
@@ -505,8 +505,8 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state, 
	}



	/*

	 * Resolve the signature_string and oem_iDString

	 * and oem_table_iDString operands

	 * Resolve the Signature string, oem_id string,

	 * and oem_table_id string operands

	 */

	status = acpi_ex_resolve_operands(op->common.aml_opcode,

					  ACPI_WALK_OPERANDS, walk_state);

drivers/acpi/acpica/evgpe.c

+2 −2
Original line number Diff line number Diff line
@@ -561,8 +561,8 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context) 
			status = AE_NO_MEMORY;

		} else {

			/*

			 * Invoke the GPE Method (_Lxx, _Exx) i.e., evaluate the _Lxx/_Exx

			 * control method that corresponds to this GPE

			 * Invoke the GPE Method (_Lxx, _Exx) i.e., evaluate the

			 * _Lxx/_Exx control method that corresponds to this GPE

			 */

			info->prefix_node =

			    local_gpe_event_info->dispatch.method_node;