GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ACPI: acpi_table_parse_madt_family() is not MADT specific

Browse source 
acpi_table_parse_madt_family() is also used to parse SRAT entries.
So re-name it to acpi_table_parse_entries(), and re-name the
madt-specific variables within it accordingly.

cosmetic only.

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown 2007-02-10 22:17:07 -05:00
parent 5a8765a84c
commit 6eb87fed52
3 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/acpi/numa.c
View file

@ -45,12 +45,6 @@ int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS]
int __cpuinitdata node_to_pxm_map[MAX_NUMNODES] int __cpuinitdata node_to_pxm_map[MAX_NUMNODES]
= { [0 ... MAX_NUMNODES - 1] = PXM_INVAL }; = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
extern int __init acpi_table_parse_madt_family(char *id,
unsigned long madt_size,
int entry_id,
acpi_table_entry_handler handler,
unsigned int max_entries);
int __cpuinit pxm_to_node(int pxm) int __cpuinit pxm_to_node(int pxm)
{ {
if (pxm < 0) if (pxm < 0)
@ -210,7 +204,7 @@ int __init
acpi_table_parse_srat(enum acpi_srat_type id, acpi_table_parse_srat(enum acpi_srat_type id,
acpi_table_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_entries(ACPI_SIG_SRAT,
sizeof(struct acpi_table_srat), id, sizeof(struct acpi_table_srat), id,
handler, max_entries); handler, max_entries);
} }

24
drivers/acpi/tables.c
View file

@ -170,40 +170,40 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header * header)
int __init int __init
acpi_table_parse_madt_family(char *id, acpi_table_parse_entries(char *id,
unsigned long madt_size, unsigned long table_size,
int entry_id, int entry_id,
acpi_table_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 *table_header = NULL;
struct acpi_subtable_header *entry; struct acpi_subtable_header *entry;
unsigned int count = 0; unsigned int count = 0;
unsigned long madt_end; unsigned long table_end;
if (!handler) if (!handler)
return -EINVAL; return -EINVAL;
/* Locate the MADT (if exists). There should only be one. */ /* Locate the table (if exists). There should only be one. */
acpi_get_table(id, 0, &madt); acpi_get_table(id, 0, &table_header);
if (!madt) { if (!table_header) {
printk(KERN_WARNING PREFIX "%4.4s not present\n", id); printk(KERN_WARNING PREFIX "%4.4s not present\n", id);
return -ENODEV; return -ENODEV;
} }
madt_end = (unsigned long)madt + madt->length; table_end = (unsigned long)table_header + table_header->length;
/* Parse all entries looking for a match. */ /* Parse all entries looking for a match. */
entry = (struct acpi_subtable_header *) entry = (struct acpi_subtable_header *)
((unsigned long)madt + madt_size); ((unsigned long)table_header + table_size);
while (((unsigned long)entry) + sizeof(struct acpi_subtable_header) < while (((unsigned long)entry) + sizeof(struct acpi_subtable_header) <
madt_end) { table_end) {
if (entry->type == entry_id if (entry->type == entry_id
&& (!max_entries || count++ < max_entries)) && (!max_entries || count++ < max_entries))
if (handler(entry, madt_end)) if (handler(entry, table_end))
return -EINVAL; return -EINVAL;
entry = (struct acpi_subtable_header *) entry = (struct acpi_subtable_header *)
@ -221,7 +221,7 @@ int __init
acpi_table_parse_madt(enum acpi_madt_type id, acpi_table_parse_madt(enum acpi_madt_type id,
acpi_table_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_entries(ACPI_SIG_MADT,
sizeof(struct acpi_table_madt), id, sizeof(struct acpi_table_madt), id,
handler, max_entries); handler, max_entries);
} }

2
include/linux/acpi.h
View file

@ -85,6 +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 __init acpi_table_parse_entries(char *id, unsigned long table_size,
int entry_id, acpi_table_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_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_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);