From patchwork Mon Jan 25 15:45:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8111151 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E3ACF9F440 for ; Mon, 25 Jan 2016 16:12:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 164C520270 for ; Mon, 25 Jan 2016 16:12:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A9BB20295 for ; Mon, 25 Jan 2016 16:12:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757535AbcAYPr0 (ORCPT ); Mon, 25 Jan 2016 10:47:26 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:58036 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757722AbcAYPrX (ORCPT ); Mon, 25 Jan 2016 10:47:23 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue004) with ESMTPA (Nemesis) id 0MNhFO-1aTnsz0COQ-007EkX; Mon, 25 Jan 2016 16:46:31 +0100 From: Arnd Bergmann To: Sebastian Reichel Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Dmitry Eremin-Solenikov , David Woodhouse , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] power: collie_battery: hide unused variable Date: Mon, 25 Jan 2016 16:45:49 +0100 Message-Id: <1453736756-1959377-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:KAQC1IARhpD6o1ptoHj+PRZG9UrBm0BBrMXDdP3F4cqINpQss7G aLj/V2mshCD0yE260lTPukVs4bAFL5anxMdFGbu4v0OA2OT2LVe9/h2FTXk/scN5EGkIt9e juShTBUwHxiY13pFGBPl9zsrOdPhPnZ/jkXf83CkpNG2nd7Th3ZlyiTOsYZaG65AeBjAiSF u6walP14NFPZ7IY3NFNsQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:JwUU+cjy7iM=:gKL0F/MwapwVH6T5x7uoN7 W3tprbnrQom64iPe8nDOmlGY2e4SGSl2loSczn4/0Mura6Mimbqpb5Cx9A7QA02tEgQaKIc3Z hloB8F3MwyZMkQrUBOllSUGhyiM/HP/3rvh0YvtqszECC03q1CmBbmPsFNJ7X3bssdMFcigAj sU6Djo9YPkRFKYSYcxgCzerzHwLjrIXmwqjiKYrOkOkJieoHetVNMFPDKLJELXfDSyiX0eDfp CIeALa9aZk6kKv1aytu6rFjuex0Uq8ZOuADwuQaacbWNLS5wb499YMPe5WX3P+aLvGc6r7221 YvgEDS8PPyDzGd7zLe7FOu5GuZOXbiCoyaz+tdckdwVikkahFnJZ69g+jSemnGRuahutb57/k 1aFQuiUFUU/+rkgnq71rrZAFEzydYkMxxxEoMH3jLHz4va0XvXCl8ExhbWrhSAXkOkpu68QV7 /ZkZSYV6CzSHWtzXctBt/Jwd99N3e3DsupofFZXwxOwrc82nnujth3xeUYMbz9CF6RSylEaUU bgvDddmyMi0pwJ3j7mWiE2pWwu4vj1nfXzITXvw/9puCVpMkTOuyKlqo/mz6XIemyrU2wmyWC GATwkgxhGo/cWvU6ZaN5uIKK4TmMhm9wtVGRw6ZjnyR8MzDNmKV8kh4n9xfPDXUjiqgRP6s9G EQLZYWZhNG67CYOuWC9MGbuP6FQE6/w65gFQmJyx/JpwxS9Dxw6qkCYdh+IQ+7H3F9+8= Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The 'wakeup_enabled' variable in this driver is only accessed by the optional power management functions and we get a warning when they are disabled: drivers/power/collie_battery.c:29:12: error: 'wakeup_enabled' defined but not used [-Werror=unused-variable] This moves the definition next to the users inside the same #ifdef, which avoids the warning. Signed-off-by: Arnd Bergmann Acked-by: Pavel Machek --- drivers/power/collie_battery.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c index 8a971b3dbe58..3a0bc608d4b5 100644 --- a/drivers/power/collie_battery.c +++ b/drivers/power/collie_battery.c @@ -26,7 +26,6 @@ static DEFINE_MUTEX(bat_lock); /* protects gpio pins */ static struct work_struct bat_work; static struct ucb1x00 *ucb; -static int wakeup_enabled; struct collie_bat { int status; @@ -291,6 +290,8 @@ static struct gpio collie_batt_gpios[] = { }; #ifdef CONFIG_PM +static int wakeup_enabled; + static int collie_bat_suspend(struct ucb1x00_dev *dev) { /* flush all pending status updates */