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

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

ACPICA: Cleanup table handler naming conflicts. 



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 44 lines of 20121114 divergence.diff.

There are naming conflicts between Linux and ACPICA on table handlers. This
patch cleans up this conflicts to reduce the source code diff between Linux
and ACPICA.

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

drivers/acpi/acpica/acglobal.h

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ ACPI_EXTERN acpi_cache_t *acpi_gbl_operand_cache; 
ACPI_EXTERN struct acpi_global_notify_handler acpi_gbl_global_notify[2];

ACPI_EXTERN acpi_exception_handler acpi_gbl_exception_handler;

ACPI_EXTERN acpi_init_handler acpi_gbl_init_handler;

ACPI_EXTERN acpi_tbl_handler acpi_gbl_table_handler;

ACPI_EXTERN acpi_table_handler acpi_gbl_table_handler;

ACPI_EXTERN void *acpi_gbl_table_handler_context;

ACPI_EXTERN struct acpi_walk_state *acpi_gbl_breakpoint_walk;

ACPI_EXTERN acpi_interface_handler acpi_gbl_interface_handler;

drivers/acpi/acpica/tbxface.c

+2 −2
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table_by_index) 
 *

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

acpi_status

acpi_install_table_handler(acpi_tbl_handler handler, void *context)

acpi_install_table_handler(acpi_table_handler handler, void *context)

{

	acpi_status status;
@@ -482,7 +482,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_table_handler) 
 * DESCRIPTION: Remove table event handler

 *

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

acpi_status acpi_remove_table_handler(acpi_tbl_handler handler)

acpi_status acpi_remove_table_handler(acpi_table_handler handler)

{

	acpi_status status;

drivers/acpi/numa.c

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static int __init acpi_parse_srat(struct acpi_table_header *table) 


static int __init

acpi_table_parse_srat(enum acpi_srat_type id,

		      acpi_table_entry_handler handler, unsigned int max_entries)

		      acpi_tbl_entry_handler handler, unsigned int max_entries)

{

	return acpi_table_parse_entries(ACPI_SIG_SRAT,

					    sizeof(struct acpi_table_srat), id,

drivers/acpi/tables.c

+3 −3
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ int __init 
acpi_table_parse_entries(char *id,

			     unsigned long table_size,

			     int entry_id,

			     acpi_table_entry_handler handler,

			     acpi_tbl_entry_handler handler,

			     unsigned int max_entries)

{

	struct acpi_table_header *table_header = NULL;
@@ -269,7 +269,7 @@ acpi_table_parse_entries(char *id, 


int __init

acpi_table_parse_madt(enum acpi_madt_type id,

		      acpi_table_entry_handler handler, unsigned int max_entries)

		      acpi_tbl_entry_handler handler, unsigned int max_entries)

{

	return acpi_table_parse_entries(ACPI_SIG_MADT,

					    sizeof(struct acpi_table_madt), id,
@@ -285,7 +285,7 @@ acpi_table_parse_madt(enum acpi_madt_type id, 
 * Scan the ACPI System Descriptor Table (STD) for a table matching @id,

 * run @handler on it.  Return 0 if table found, return on if not.

 */

int __init acpi_table_parse(char *id, acpi_table_handler handler)

int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)

{

	struct acpi_table_header *table = NULL;

	acpi_size tbl_size;

include/acpi/acpixf.h

+2 −2
Original line number Diff line number Diff line
@@ -197,9 +197,9 @@ acpi_status 
acpi_get_table_by_index(u32 table_index, struct acpi_table_header **out_table);



acpi_status

acpi_install_table_handler(acpi_tbl_handler handler, void *context);

acpi_install_table_handler(acpi_table_handler handler, void *context);



acpi_status acpi_remove_table_handler(acpi_tbl_handler handler);

acpi_status acpi_remove_table_handler(acpi_table_handler handler);



/*

 * Namespace and name interfaces