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: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index fe20e186ca1032c8e62455ec683779395f85a25b..35006d193d517fe23aff3e710a7aff1f941d95ac 100644 (file)
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -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 */

diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index b5a4651cf2b752f051fd0f6ee00d5cac5330459a..564f2abf59042549713bacf03ad22893b2e57aa5 100644 (file)
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -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 */
 

diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index 364a1303fb8f2fe7e0f78feb6243c0f8e797ca31..ac4269fb1a379b6ffe0283f6741a70807b08500a 100644 (file)
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -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;
 

diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c
index 642f3c053e878e95d1a55fc9b149de42dce19f79..fa44609aba3337e881584523a1e405c93ee26034 100644 (file)
--- a/drivers/acpi/acpica/dswexec.c
+++ b/drivers/acpi/acpica/dswexec.c
@@ -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,

diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index 7587eb6c9584f4565e622512095b33fa77468f86..ae668f32cf16f8c0dbf8b22d4629a99a8ded54a8 100644 (file)
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -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;
 

diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 7c3f98ba4afefd00686fffc36283ad783a3e4798..ea61ca9129cdfe6322b7677a27d6c5a52c110192 100644 (file)
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -476,7 +476,7 @@ static void fixed_event_count(u32 event_number)
        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)
 {
        if (event_type == ACPI_EVENT_TYPE_GPE)
@@ -638,7 +638,7 @@ void acpi_irq_stats_init(void)
        if (all_counters == NULL)
                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))
                goto fail;
 

diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 8b891dbead666826e8380971a79caac5db16327a..352fd1a3832127b55873cd461de13a2cc2d5c0c3 100644 (file)
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -274,7 +274,7 @@ acpi_install_initialization_handler(acpi_init_handler handler, u32 function);
 
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                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_install_fixed_event_handler(u32

diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 7520f420e4ee0475087bc94cb80fe5a7dd775b03..ea50a314e552a4a4c83ca28359cbcaeb8dd76d3b 100644 (file)
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -796,11 +796,11 @@ typedef u8 acpi_adr_space_type;
 
 /* 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 {
-       ACPI_SLEEP_FUNCTION legacy_function;
-       ACPI_SLEEP_FUNCTION extended_function;
+       acpi_sleep_function legacy_function;
+       acpi_sleep_function extended_function;
 };
 
 /*
@@ -931,7 +931,7 @@ typedef void
  * Various handlers and callback procedures
  */
 typedef
-void (*ACPI_GBL_EVENT_HANDLER) (u32 event_type,
+void (*acpi_gbl_event_handler) (u32 event_type,
                               acpi_handle device,
                               u32 event_number, void *context);