OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, ACPI: delete acpi_boot_table_init() return value 

cleanup only.

setup_arch(), doesn't care care if ACPI initialization succeeded
or failed, so delete acpi_boot_table_init()'s return value.

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown 2010-01-06 16:11:06 -05:00
parent 74d2e4f8d7
commit 8558e3943d
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/x86/kernel/acpi/boot.c
View File

@ -1529,16 +1529,10 @@ static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
* if acpi_blacklisted() acpi_disabled = 1; * if acpi_blacklisted() acpi_disabled = 1;
* acpi_irq_model=... * acpi_irq_model=...
* ... * ...
*
* return value: (currently ignored)
* 0: success
* !0: failure
*/ */
int __init acpi_boot_table_init(void) void __init acpi_boot_table_init(void)
{ {
int error;
dmi_check_system(acpi_dmi_table); dmi_check_system(acpi_dmi_table);
/* /*
@ -1546,15 +1540,14 @@ int __init acpi_boot_table_init(void)
* One exception: acpi=ht continues far enough to enumerate LAPICs * One exception: acpi=ht continues far enough to enumerate LAPICs
*/ */
if (acpi_disabled && !acpi_ht) if (acpi_disabled && !acpi_ht)
return 1; return;
/* /*
* Initialize the ACPI boot-time table parser. * Initialize the ACPI boot-time table parser.
*/ */
error = acpi_table_init(); if (acpi_table_init()) {
if (error) {
disable_acpi(); disable_acpi();
return error; return;
} }
acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf); acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);
@ -1562,18 +1555,15 @@ int __init acpi_boot_table_init(void)
/* /*
* blacklist may disable ACPI entirely * blacklist may disable ACPI entirely
*/ */
error = acpi_blacklisted(); if (acpi_blacklisted()) {
if (error) {
if (acpi_force) { if (acpi_force) {
printk(KERN_WARNING PREFIX "acpi=force override\n"); printk(KERN_WARNING PREFIX "acpi=force override\n");
} else { } else {
printk(KERN_WARNING PREFIX "Disabling ACPI support\n"); printk(KERN_WARNING PREFIX "Disabling ACPI support\n");
disable_acpi(); disable_acpi();
return error; return;
} }
} }
return 0;
} }
int __init early_acpi_boot_init(void) int __init early_acpi_boot_init(void)

6
include/linux/acpi.h
View File

@ -80,7 +80,7 @@ char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
void __acpi_unmap_table(char *map, unsigned long size); void __acpi_unmap_table(char *map, unsigned long size);
int early_acpi_boot_init(void); int early_acpi_boot_init(void);
int acpi_boot_init (void); int acpi_boot_init (void);
int acpi_boot_table_init (void); void acpi_boot_table_init (void);
int acpi_mps_check (void); int acpi_mps_check (void);
int acpi_numa_init (void); int acpi_numa_init (void);
@ -321,9 +321,9 @@ static inline int acpi_boot_init(void)
return 0; return 0;
} }
static inline int acpi_boot_table_init(void) static inline void acpi_boot_table_init(void)
{ {
return 0; return;
} }
static inline int acpi_mps_check(void) static inline int acpi_mps_check(void)