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

Commit 1f86e8c1 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Fix indent caused divergences. 



New version of "indent" program will generate different outputs that
will lead to the divergences between the Linux and the ACPICA.
This patch fixes such divergences caused by the "indent" program.
The version of the "indent" used for this patch is "GNU indent 2.2.11".

This patch will not affect the generated vmlinux binary.
This will decrease 581 lines of 20120913 divergence.diff.

Signed-off-by: default avatarRobert Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 644ef74e

drivers/acpi/acpica/acdispat.h

+7 −4
Original line number Diff line number Diff line
@@ -309,9 +309,12 @@ acpi_ds_obj_stack_push(void *object, struct acpi_walk_state *walk_state); 
acpi_status

acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state *walk_state);



struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union acpi_parse_object

						  *origin, union acpi_operand_object

						  *mth_desc, struct acpi_thread_state

struct acpi_walk_state * acpi_ds_create_walk_state(acpi_owner_id owner_id,

						   union acpi_parse_object

						   *origin,

						   union acpi_operand_object

						   *mth_desc,

						   struct acpi_thread_state

						   *thread);



acpi_status

drivers/acpi/acpica/acevents.h

+4 −2
Original line number Diff line number Diff line
@@ -84,9 +84,11 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info); 


acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);



acpi_status acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);

acpi_status

acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);



acpi_status acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);

acpi_status

acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);



struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,

						       u32 gpe_number);

drivers/acpi/acpica/aclocal.h

+4 −2
Original line number Diff line number Diff line
@@ -486,8 +486,10 @@ struct acpi_gpe_device_info { 
	struct acpi_namespace_node *gpe_device;

};



typedef acpi_status(*acpi_gpe_callback) (struct acpi_gpe_xrupt_info *gpe_xrupt_info,

		struct acpi_gpe_block_info *gpe_block, void *context);

typedef acpi_status(*acpi_gpe_callback) (struct acpi_gpe_xrupt_info *

					 gpe_xrupt_info,

					 struct acpi_gpe_block_info *gpe_block,

					 void *context);



/* Information about each particular fixed event */

drivers/acpi/acpica/acparser.h

+1 −2
Original line number Diff line number Diff line
@@ -150,8 +150,7 @@ u8 acpi_ps_has_completed_scope(struct acpi_parse_state *parser_state); 


void

acpi_ps_pop_scope(struct acpi_parse_state *parser_state,

		  union acpi_parse_object **op,

		  u32 * arg_list, u32 * arg_count);

		  union acpi_parse_object **op, u32 *arg_list, u32 *arg_count);



acpi_status

acpi_ps_push_scope(struct acpi_parse_state *parser_state,

drivers/acpi/acpica/acpredef.h

+6 −5
Original line number Diff line number Diff line
@@ -150,8 +150,7 @@ enum acpi_return_package_types { 
 * is saved here (rather than in a separate table) in order to minimize the

 * overall size of the stored data.

 */

static const union acpi_predefined_info predefined_names[] =

{

static const union acpi_predefined_info predefined_names[] = {

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

	{{"_AC1", 0, ACPI_RTYPE_INTEGER}},

	{{"_AC2", 0, ACPI_RTYPE_INTEGER}},
@@ -538,7 +537,8 @@ static const union acpi_predefined_info predefined_names[] = 


	/* Acpi 1.0 defined _WAK with no return value. Later, it was changed to return a package */



	{{"_WAK", 1, ACPI_RTYPE_NONE | ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE}},

	{{"_WAK", 1,

          ACPI_RTYPE_NONE | ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE}},

			  {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2,0}, 0,0}}, /* Fixed-length (2 Int), but is optional */



	/* _WDG/_WED are MS extensions defined by "Windows Instrumentation" */
@@ -551,11 +551,12 @@ static const union acpi_predefined_info predefined_names[] = 
};



#if 0



	/* This is an internally implemented control method, no need to check */

	{{"_OSI", 1, ACPI_RTYPE_INTEGER}},

{ {

"_OSI", 1, ACPI_RTYPE_INTEGER}},



	/* TBD: */



	_PRT - currently ignore reversed entries. attempt to fix here?

	think about possibly fixing package elements like _BIF, etc.

#endif