瀏覽代碼

ACPI: acpi_madt_entry_handler() is not MADT specific

acpi_madt_entry_handler() is also used for the SRAT,
so re-name it acpi_table_entry_handler().

cosmetic only.

Signed-off-by: Len Brown <len.brown@intel.com>
Len Brown 18 年之前
父節點
當前提交
5a8765a84c
共有 3 個文件被更改,包括 7 次插入7 次删除
  1. 2 2
      drivers/acpi/numa.c
  2. 2 2
      drivers/acpi/tables.c
  3. 3 3
      include/linux/acpi.h

+ 2 - 2
drivers/acpi/numa.c

@@ -48,7 +48,7 @@ int __cpuinitdata node_to_pxm_map[MAX_NUMNODES]
 extern int __init acpi_table_parse_madt_family(char *id,
 extern int __init acpi_table_parse_madt_family(char *id,
 					       unsigned long madt_size,
 					       unsigned long madt_size,
 					       int entry_id,
 					       int entry_id,
-					       acpi_madt_entry_handler handler,
+					       acpi_table_entry_handler handler,
 					       unsigned int max_entries);
 					       unsigned int max_entries);
 
 
 int __cpuinit pxm_to_node(int pxm)
 int __cpuinit pxm_to_node(int pxm)
@@ -208,7 +208,7 @@ static int __init acpi_parse_srat(struct acpi_table_header *table)
 
 
 int __init
 int __init
 acpi_table_parse_srat(enum acpi_srat_type id,
 acpi_table_parse_srat(enum acpi_srat_type id,
-		      acpi_madt_entry_handler handler, unsigned int max_entries)
+		      acpi_table_entry_handler handler, unsigned int max_entries)
 {
 {
 	return acpi_table_parse_madt_family(ACPI_SIG_SRAT,
 	return acpi_table_parse_madt_family(ACPI_SIG_SRAT,
 					    sizeof(struct acpi_table_srat), id,
 					    sizeof(struct acpi_table_srat), id,

+ 2 - 2
drivers/acpi/tables.c

@@ -173,7 +173,7 @@ int __init
 acpi_table_parse_madt_family(char *id,
 acpi_table_parse_madt_family(char *id,
 			     unsigned long madt_size,
 			     unsigned long madt_size,
 			     int entry_id,
 			     int entry_id,
-			     acpi_madt_entry_handler handler,
+			     acpi_table_entry_handler handler,
 			     unsigned int max_entries)
 			     unsigned int max_entries)
 {
 {
 	struct acpi_table_header *madt = NULL;
 	struct acpi_table_header *madt = NULL;
@@ -219,7 +219,7 @@ acpi_table_parse_madt_family(char *id,
 
 
 int __init
 int __init
 acpi_table_parse_madt(enum acpi_madt_type id,
 acpi_table_parse_madt(enum acpi_madt_type id,
-		      acpi_madt_entry_handler handler, unsigned int max_entries)
+		      acpi_table_entry_handler handler, unsigned int max_entries)
 {
 {
 	return acpi_table_parse_madt_family(ACPI_SIG_MADT,
 	return acpi_table_parse_madt_family(ACPI_SIG_MADT,
 					    sizeof(struct acpi_table_madt), id,
 					    sizeof(struct acpi_table_madt), id,

+ 3 - 3
include/linux/acpi.h

@@ -75,7 +75,7 @@ enum acpi_address_range_id {
 
 
 typedef int (*acpi_table_handler) (struct acpi_table_header *table);
 typedef int (*acpi_table_handler) (struct acpi_table_header *table);
 
 
-typedef int (*acpi_madt_entry_handler) (struct acpi_subtable_header *header, const unsigned long end);
+typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end);
 
 
 char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
 char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
 unsigned long acpi_find_rsdp (void);
 unsigned long acpi_find_rsdp (void);
@@ -85,8 +85,8 @@ int acpi_numa_init (void);
 
 
 int acpi_table_init (void);
 int acpi_table_init (void);
 int acpi_table_parse (char *id, acpi_table_handler handler);
 int acpi_table_parse (char *id, acpi_table_handler handler);
-int acpi_table_parse_madt (enum acpi_madt_type id, acpi_madt_entry_handler handler, unsigned int max_entries);
-int acpi_table_parse_srat (enum acpi_srat_type id, acpi_madt_entry_handler handler, unsigned int max_entries);
+int acpi_table_parse_madt (enum acpi_madt_type id, acpi_table_entry_handler handler, unsigned int max_entries);
+int acpi_table_parse_srat (enum acpi_srat_type id, acpi_table_entry_handler handler, unsigned int max_entries);
 int acpi_parse_mcfg (struct acpi_table_header *header);
 int acpi_parse_mcfg (struct acpi_table_header *header);
 void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);
 void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);
 void acpi_table_print_srat_entry (struct acpi_subtable_header *srat);
 void acpi_table_print_srat_entry (struct acpi_subtable_header *srat);