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

Commit 644ef74e authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Fix AcpiSrc caused divergences. 



There are definitions that can been converted into new styles by
the recent AcpiSrc while they remain the old styles in the Linux.
This patch fixes those definitions that will be converted by the
AcpiSrc.

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

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

drivers/acpi/acpica/acglobal.h

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ ACPI_EXTERN struct acpi_gpe_block_info 
#if (!ACPI_REDUCED_HARDWARE)



ACPI_EXTERN u8 acpi_gbl_all_gpes_initialized;

ACPI_EXTERN ACPI_GBL_EVENT_HANDLER acpi_gbl_global_event_handler;

ACPI_EXTERN acpi_gbl_event_handler acpi_gbl_global_event_handler;

ACPI_EXTERN void *acpi_gbl_global_event_handler_context;



#endif				/* !ACPI_REDUCED_HARDWARE */

drivers/acpi/acpica/aclocal.h

+2 −2
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ struct acpi_create_field_info { 
};



typedef

acpi_status(*ACPI_INTERNAL_METHOD) (struct acpi_walk_state * walk_state);

acpi_status(*acpi_internal_method) (struct acpi_walk_state * walk_state);



/*

 * Bitmapped ACPI types.  Used internally only
@@ -645,7 +645,7 @@ union acpi_generic_state { 
 *

 ****************************************************************************/



typedef acpi_status(*ACPI_EXECUTE_OP) (struct acpi_walk_state * walk_state);

typedef acpi_status(*acpi_execute_op) (struct acpi_walk_state * walk_state);



/* Address Range info block */

drivers/acpi/acpica/acobject.h

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ struct acpi_object_method { 
	union acpi_operand_object *mutex;

	u8 *aml_start;

	union {

		ACPI_INTERNAL_METHOD implementation;

		acpi_internal_method implementation;

		union acpi_operand_object *handler;

	} dispatch;

drivers/acpi/acpica/dswexec.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ ACPI_MODULE_NAME("dswexec") 
/*

 * Dispatch table for opcode classes

 */

static ACPI_EXECUTE_OP acpi_gbl_op_type_dispatch[] = {

static acpi_execute_op acpi_gbl_op_type_dispatch[] = {

	acpi_ex_opcode_0A_0T_1R,

	acpi_ex_opcode_1A_0T_0R,

	acpi_ex_opcode_1A_0T_1R,

drivers/acpi/acpica/evxface.c

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_exception_handler) 
 *

 ******************************************************************************/

acpi_status

acpi_install_global_event_handler(ACPI_GBL_EVENT_HANDLER handler, void *context)

acpi_install_global_event_handler(acpi_gbl_event_handler handler, void *context)

{

	acpi_status status;