From patchwork Fri Jan 9 20:17:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 1620 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 n09KEVbm012930 for ; Fri, 9 Jan 2009 12:14:31 -0800 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754865AbZAIUSO (ORCPT ); Fri, 9 Jan 2009 15:18:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754846AbZAIUSO (ORCPT ); Fri, 9 Jan 2009 15:18:14 -0500 Received: from smtp1.linux-foundation.org ([140.211.169.13]:49471 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754739AbZAIUSL (ORCPT ); Fri, 9 Jan 2009 15:18:11 -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 n09KHD9h021383 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 9 Jan 2009 12:17:14 -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 n09KHDk8015002; Fri, 9 Jan 2009 12:17:13 -0800 Message-Id: <200901092017.n09KHDk8015002@imap1.linux-foundation.org> Subject: [patch 5/6] drivers/acpi/hardware/hwsleep.c: fix warning msg To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, akpm@linux-foundation.org, valdis.kletnieks@vt.edu From: akpm@linux-foundation.org Date: Fri, 09 Jan 2009 12:17:12 -0800 X-Spam-Status: No, hits=-3.411 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: Valdis Kletnieks In mmotm1230 the linux.next patch, most likely via this commit: commit ecd196686aee5028f71ee09072c8581c7293a847 Author: Len Brown Date: Fri Dec 19 03:53:37 2008 -0500 ACPICA: disable ACPI 2.0 _GTS/_BFS support added some warning messages: CC drivers/acpi/hardware/hwsleep.o drivers/acpi/hardware/hwsleep.c: In function`acpi_enter_sleep_state': drivers/acpi/hardware/hwsleep.c:231: warning: unused variable`arg' drivers/acpi/hardware/hwsleep.c:230: warning: unused variable`arg_list' drivers/acpi/hardware/hwsleep.c: In function`acpi_leave_sleep_state_prep': drivers/acpi/hardware/hwsleep.c:471: warning: unused variable`arg' drivers/acpi/hardware/hwsleep.c:470: warning: unused variable`arg_list' If we're going to ifdef-wrap the code, let's do the variables involved as well, so we don't get warnings. Signed-off-by: Valdis Kletnieks Cc: Len Brown Signed-off-by: Andrew Morton --- drivers/acpi/hardware/hwsleep.c | 4 ++++ 1 file changed, 4 insertions(+) diff -puN drivers/acpi/hardware/hwsleep.c~drivers-acpi-hardware-hwsleepc-fix-warning-msg drivers/acpi/hardware/hwsleep.c --- a/drivers/acpi/hardware/hwsleep.c~drivers-acpi-hardware-hwsleepc-fix-warning-msg +++ a/drivers/acpi/hardware/hwsleep.c @@ -227,8 +227,10 @@ acpi_status asmlinkage acpi_enter_sleep_ struct acpi_bit_register_info *sleep_type_reg_info; struct acpi_bit_register_info *sleep_enable_reg_info; u32 in_value; +#ifdef ACPI_20_GTS_BFS struct acpi_object_list arg_list; union acpi_object arg; +#endif acpi_status status; ACPI_FUNCTION_TRACE(acpi_enter_sleep_state); @@ -467,8 +469,10 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_stat ******************************************************************************/ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state) { +#ifdef ACPI_20_GTS_BFS struct acpi_object_list arg_list; union acpi_object arg; +#endif acpi_status status; struct acpi_bit_register_info *sleep_type_reg_info; struct acpi_bit_register_info *sleep_enable_reg_info;