ACPI: bus.c, remove doubled status checking
PATCH 1/1 ACPI: bus.c, remove doubled status checking
There was a misplaced status test (two consequent tests without a statement in between) in acpi_bus_init for ages. Remove it, since the function which should be checked (acpi_os_initialize1) has BUG_ONs on failure paths.
On platforms with BUG_ON not being "noreturn", we panics elsewhere since the function ever returns 0 anyway.
Signed-off-by Jiri Slaby <[email protected]>
Cc Len Brown <[email protected]>
--- drivers/acpi/bus.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-)
drivers/acpi/bus.c +1 -8
@@ -758,8 +758,7 @@ static int __init acpi_bus_init(void)acpi_status status =AE_OK ;extern acpi_status acpi_os_initialize1 (void ); - - status =acpi_os_initialize1 (); +acpi_os_initialize1 (); status =acpi_enable_subsystem (ACPI_NO_HARDWARE_INIT |ACPI_NO_ACPI_ENABLE );
@@ -769,12 +768,6 @@ static int __init acpi_bus_init(void) goto error1; } -if (ACPI_FAILURE (status)) { - printk(KERN_ERR PREFIX - "Unable to initialize ACPI OS objects\n"); - goto error1; - } -/* * ACPI 2.0 requires the EC driver to be loaded and work before * the EC device is found in the namespace (i.e. before acpi_initialize_objects()
Signature · 1 line
1.6.1.3