acpi: bus.c, remove doubled status checking
PATCH 5/8 acpi: bus.c, remove doubled status checking
From: Jiri Slaby <[email protected]>
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.
Signed-off-by Jiri Slaby <[email protected]>
Cc Len Brown <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/acpi/bus.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/acpi/bus.c renamed from drivers/acpi/bus.c~acpi-busc-remove-doubled-status-checking +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()
_
applied
thanks,
Len Brown, Intel Open Source Technology Center
Quoted 43 lines · On Wed, 4 Mar 2009, [email protected] wrote:
From: Jiri Slaby <[email protected]>
There was a misplaced status test (two consequent tests without a statement in between) in
acpi_bus_initfor ages. Remove it, since the function which should be checked (acpi_os_initialize1) hasBUG_ONson failure paths.Signed-off-by Jiri Slaby <[email protected]>Cc Len Brown <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
drivers/acpi/bus.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)diff -puN
drivers/acpi/bus.c~acpi-busc-remove-doubled-status-checkingdrivers/acpi/bus.cdrivers/acpi/bus.c renamed from drivers/acpi/bus.c~acpi-busc-remove-doubled-status-checking +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() _