From b43e1065cab4b5be90c016b2f076086b70cd1556 Mon Sep 17 00:00:00 2001 From: Lv Zheng Date: Sat, 12 Jan 2013 15:29:38 +0000 Subject: 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: Lv Zheng Signed-off-by: Rafael J. Wysocki --- include/acpi/acpixf.h | 4 ++-- include/acpi/actypes.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'include/acpi') diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index b86364d..d8b2ea6 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -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 diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index cd89810..3d4e09c 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h @@ -984,7 +984,7 @@ acpi_status(*acpi_exception_handler) (acpi_status aml_status, /* Table Event handler (Load, load_table, etc.) and types */ typedef -acpi_status(*acpi_tbl_handler) (u32 event, void *table, void *context); +acpi_status(*acpi_table_handler) (u32 event, void *table, void *context); #define ACPI_TABLE_LOAD 0x0 #define ACPI_TABLE_UNLOAD 0x1 -- cgit v1.1