From patchwork Mon Jun 3 22:03:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2655361 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 84C25DF24C for ; Mon, 3 Jun 2013 22:04:35 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ujcr3-0007bY-Vn; Mon, 03 Jun 2013 22:03:54 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ujcqy-0004a9-BU; Mon, 03 Jun 2013 22:03:48 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ujcqv-0004ZO-KY for linux-arm-kernel@lists.infradead.org; Mon, 03 Jun 2013 22:03:46 +0000 Received: from wuerfel.localnet (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MaV5d-1UypPo33t3-00K9uM; Tue, 04 Jun 2013 00:03:17 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org, Gregory CLEMENT , Jason Cooper , John Stultz , Thomas Gleixner Subject: [PATCH] clocksource: armada-xp: always register local_timer_ops Date: Tue, 04 Jun 2013 00:03:38 +0200 Message-ID: <3039627.dHjlxm4JCV@wuerfel> User-Agent: KMail/4.10.2 (Linux/3.10.0-rc3-next-20130527+; KDE/4.10.3; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V02:K0:tt4aFrv3QJ8DPcLVA8P5qbyv1uiZRkf6a7FEx6AanxG fnvk2SwcYctfjFa9sjPoFqPiQG0QF0cdOTKvzFDFjb5YpS5kLZ aaRkn6/mMhjBC3DGwhCOD4xMVqYX4SfX5OXqXzA7q+KzJdAaec 0JxV4fWI1t/LPUz34mM5rfdNjChEXBtEAbfzBlEw8MpmnDReQr 2ILbB+AslELS1HQQmqqmgvafICCEOcAvzr5FYTEKXQHpk38Zb7 3jevcXlIXCg6hIJ0VkDovWnRmVUVXipDvSfYcHPfZSlF+Xrs/8 OEvdGlqSojH43Pg/yko4MFwg2nmJPo3L5TlfPH3nvEQlZGcBAA HCuRxy1vOYZ6FwUMQ254= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130603_180345_884696_DD9BD373 X-CRM114-Status: UNSURE ( 6.82 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The call to local_timer_register is hidden behind an #ifdef, which turns the armada_370_xp_local_timer_ops into a potentially unused variable, causing this warning: time-armada-370-xp.c:208:31: warning: 'armada_370_xp_local_timer_ops' defined but not used [-Wunused-variable] static struct local_timer_ops armada_370_xp_local_timer_ops __cpuinitdata = { ^ Since local_timer_register() itself doesn't do anything, just removing the #ifdef makes the code look nicer and gets rid of the warning. Signed-off-by: Arnd Bergmann Cc: Gregory CLEMENT Cc: Jason Cooper Acked-by: Jason Cooper --- Please apply for 3.11 diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c index 47a6730..4cd8520 100644 --- a/drivers/clocksource/time-armada-370-xp.c +++ b/drivers/clocksource/time-armada-370-xp.c @@ -294,8 +294,6 @@ void __init armada_370_xp_timer_init(void) percpu_armada_370_xp_evt); if (!res) { enable_percpu_irq(armada_370_xp_clkevt.irq, 0); -#ifdef CONFIG_LOCAL_TIMERS local_timer_register(&armada_370_xp_local_timer_ops); -#endif } }