leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPICA: Fix AcpiSrc caused divergences.

Browse Source 
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: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Lv Zheng 2012-10-31 02:25:36 +00:00 committed by Rafael J. Wysocki
parent 78e25fef27
commit 644ef74e6d
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/acpica/acglobal.h
View File

@ -376,7 +376,7 @@ ACPI_EXTERN struct acpi_gpe_block_info
#if (!ACPI_REDUCED_HARDWARE) #if (!ACPI_REDUCED_HARDWARE)
ACPI_EXTERN u8 acpi_gbl_all_gpes_initialized; 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; ACPI_EXTERN void *acpi_gbl_global_event_handler_context;
#endif /* !ACPI_REDUCED_HARDWARE */ #endif /* !ACPI_REDUCED_HARDWARE */

4
drivers/acpi/acpica/aclocal.h
View File

@ -262,7 +262,7 @@ struct acpi_create_field_info {
}; };
typedef 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 * 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 */ /* Address Range info block */

2
drivers/acpi/acpica/acobject.h
View File

@ -179,7 +179,7 @@ struct acpi_object_method {
union acpi_operand_object *mutex; union acpi_operand_object *mutex;
u8 *aml_start; u8 *aml_start;
union { union {
ACPI_INTERNAL_METHOD implementation; acpi_internal_method implementation;
union acpi_operand_object *handler; union acpi_operand_object *handler;
} dispatch; } dispatch;

2
drivers/acpi/acpica/dswexec.c
View File

@ -57,7 +57,7 @@ ACPI_MODULE_NAME("dswexec")
/* /*
* Dispatch table for opcode classes * 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_0A_0T_1R,
acpi_ex_opcode_1A_0T_0R, acpi_ex_opcode_1A_0T_0R,
acpi_ex_opcode_1A_0T_1R, acpi_ex_opcode_1A_0T_1R,

2
drivers/acpi/acpica/evxface.c
View File

@ -398,7 +398,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_exception_handler)
* *
******************************************************************************/ ******************************************************************************/
acpi_status 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; acpi_status status;

4
drivers/acpi/sysfs.c
View File

@ -476,7 +476,7 @@ static void fixed_event_count(u32 event_number)
return; return;
} }
static void acpi_gbl_event_handler(u32 event_type, acpi_handle device, static void acpi_global_event_handler(u32 event_type, acpi_handle device,
u32 event_number, void *context) u32 event_number, void *context)
{ {
if (event_type == ACPI_EVENT_TYPE_GPE) if (event_type == ACPI_EVENT_TYPE_GPE)
@ -638,7 +638,7 @@ void acpi_irq_stats_init(void)
if (all_counters == NULL) if (all_counters == NULL)
goto fail; goto fail;
status = acpi_install_global_event_handler(acpi_gbl_event_handler, NULL); status = acpi_install_global_event_handler(acpi_global_event_handler, NULL);
if (ACPI_FAILURE(status)) if (ACPI_FAILURE(status))
goto fail; goto fail;

2
include/acpi/acpixf.h
View File

@ -274,7 +274,7 @@ acpi_install_initialization_handler(acpi_init_handler handler, u32 function);
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
acpi_install_global_event_handler acpi_install_global_event_handler
(ACPI_GBL_EVENT_HANDLER handler, void *context)) (acpi_gbl_event_handler handler, void *context))
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
acpi_install_fixed_event_handler(u32 acpi_install_fixed_event_handler(u32

8
include/acpi/actypes.h
View File

@ -796,11 +796,11 @@ typedef u8 acpi_adr_space_type;
/* Sleep function dispatch */ /* Sleep function dispatch */
typedef acpi_status(*ACPI_SLEEP_FUNCTION) (u8 sleep_state); typedef acpi_status(*acpi_sleep_function) (u8 sleep_state);
struct acpi_sleep_functions { struct acpi_sleep_functions {
ACPI_SLEEP_FUNCTION legacy_function; acpi_sleep_function legacy_function;
ACPI_SLEEP_FUNCTION extended_function; acpi_sleep_function extended_function;
}; };
/* /*
@ -931,7 +931,7 @@ typedef void
* Various handlers and callback procedures * Various handlers and callback procedures
*/ */
typedef typedef
void (*ACPI_GBL_EVENT_HANDLER) (u32 event_type, void (*acpi_gbl_event_handler) (u32 event_type,
acpi_handle device, acpi_handle device,
u32 event_number, void *context); u32 event_number, void *context);