From patchwork Wed Mar 4 19:55:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 9907 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n24JuAr4023685 for ; Wed, 4 Mar 2009 19:56:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756178AbZCDT4N (ORCPT ); Wed, 4 Mar 2009 14:56:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756160AbZCDT4N (ORCPT ); Wed, 4 Mar 2009 14:56:13 -0500 Received: from smtp1.linux-foundation.org ([140.211.169.13]:59344 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756178AbZCDT4K (ORCPT ); Wed, 4 Mar 2009 14:56:10 -0500 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n24JtSwQ010542 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 4 Mar 2009 11:55:29 -0800 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id n24JtSHW028000; Wed, 4 Mar 2009 11:55:28 -0800 Message-Id: <200903041955.n24JtSHW028000@imap1.linux-foundation.org> Subject: [patch 5/8] acpi: bus.c, remove doubled status checking To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, akpm@linux-foundation.org, jirislaby@gmail.com From: akpm@linux-foundation.org Date: Wed, 04 Mar 2009 11:55:27 -0800 X-Spam-Status: No, hits=-3.453 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Jiri Slaby 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 Cc: Len Brown Signed-off-by: Andrew Morton --- drivers/acpi/bus.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff -puN drivers/acpi/bus.c~acpi-busc-remove-doubled-status-checking drivers/acpi/bus.c --- a/drivers/acpi/bus.c~acpi-busc-remove-doubled-status-checking +++ a/drivers/acpi/bus.c @@ -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()