From patchwork Mon Jan 20 21:52:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 3514681 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0BF3BC02DC for ; Mon, 20 Jan 2014 21:52:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 43C8D2015A for ; Mon, 20 Jan 2014 21:52:53 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4D3A620122 for ; Mon, 20 Jan 2014 21:52:52 +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 1W5Mlv-0007n6-UG; Mon, 20 Jan 2014 21:52:44 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W5Mlt-0004eo-I4; Mon, 20 Jan 2014 21:52:41 +0000 Received: from [2a01:e35:139b:9f90:221:70ff:fe55:8f78] (helo=smtp.natisbad.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W5Mlr-0004dh-33 for linux-arm-kernel@lists.infradead.org; Mon, 20 Jan 2014 21:52:39 +0000 Received: by smtp.natisbad.org (Postfix, from userid 5001) id C60052C0ADD; Mon, 20 Jan 2014 22:52:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1390254734; bh=QcTeUgKRdVn64x5kC8dJNo+MRa9X5I8N38Qes83GZ+s=; h=From:To:Cc:Subject:Date; b=uN5Z6MO5IVgXXhRsG8ZOwP41x5KELbAynXYlqfN1JCvc9rIqtv7RvhjZGv+X3wqoi TZzpvLlk3iaqIAkL9vfMIjpqZa3x4Ew534LOSkPj7FBau+FYgRvS2jj+kPDL/u+nrs qgXE2RwyMR3OS8LHhMtvas9aRU2G2dLDhytixbnQ= X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from small (localhost [127.0.0.1]) by smtp.natisbad.org (Postfix) with ESMTP id E87FA2C0910; Mon, 20 Jan 2014 22:52:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1390254727; bh=QcTeUgKRdVn64x5kC8dJNo+MRa9X5I8N38Qes83GZ+s=; h=From:To:Cc:Subject:Date; b=cWipwURKJqUeEpPy1axwpEbXXnWrJwDf+I75E+ehWl4CvWpaz3yv6Wen0FmJcZXZT GhzND+xhI2zIuVjMxkj+SoDAuztlH+Rx1sbouCEfuEyLWc45KrZH/vpG8pq9Jd/9Sq 9+IzthA/Fe8sJ6LcZsqnu/zyMxmqpvfVOFOWVAIw= X-Hashcash: 1:20:140120:jason@lakedaemon.net::kj7fhLdJEyhKEgPX:00000000000000000000000000000000000000000BDIj X-Hashcash: 1:20:140120:andrew@lunn.ch::4w73K277abl+lOaS:0002Lsy X-Hashcash: 1:20:140120:gregory.clement@free-electrons.com::K2mtY0UweumLB+pE:0000000000000000000000000006ivg X-Hashcash: 1:20:140120:sebastian.hesselbarth@gmail.com::Oe6jMytwSL8iVIS9:0000000000000000000000000000001tol X-Hashcash: 1:20:140120:arnd@arndb.de::SjorBNVBj35ugY1e:00000RyJ X-Hashcash: 1:20:140120:linux@arm.linux.org.uk::+giBYB7mlkDxfY/2:00000000000000000000000000000000000000029xQ X-Hashcash: 1:20:140120:linux-arm-kernel@lists.infradead.org::qiNv5uQY7I6EVfgk:00000000000000000000000003Z5X From: arno@natisbad.org (Arnaud Ebalard) To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth Subject: [PATCHv2] ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP) X-PGP-Key-URL: http://natisbad.org/arno@natisbad.org.asc X-Fingerprint: D3A5 B68A 839B 38A5 815A 781B B77C 0748 A7AE 341B Date: Mon, 20 Jan 2014 22:52:05 +0100 Message-ID: <87txcy8goq.fsf@natisbad.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140120_165239_332620_4E85CCC8 X-CRM114-Status: GOOD ( 13.01 ) X-Spam-Score: -1.2 (-) Cc: Russell King , linux-arm-kernel@lists.infradead.org, Arnd Bergmann 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 X-Virus-Scanned: ClamAV using ClamSMTP The following appears during compilation for an Armada 370 target because 'irq_controller_lock' is used only when CONFIG_SMP is enabled: drivers/irqchip/irq-armada-370-xp.c:62:8: warning: 'irq_controller_lock' defined but not used [-Wunused-variable] Fix that warning by moving declaration of 'irq_controller_lock' inside existing #ifdef. Signed-off-by: Arnaud Ebalard --- Changes since v1: - moved declaration inside existing #ifdef as suggested by Arnd, instead of adding a new one. drivers/irqchip/irq-armada-370-xp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index 433cc8568dec..9300bc32784e 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -59,8 +59,6 @@ #define PCI_MSI_DOORBELL_END (32) #define PCI_MSI_DOORBELL_MASK 0xFFFF0000 -static DEFINE_RAW_SPINLOCK(irq_controller_lock); - static void __iomem *per_cpu_int_base; static void __iomem *main_int_base; static struct irq_domain *armada_370_xp_mpic_domain; @@ -239,6 +237,8 @@ static inline int armada_370_xp_msi_init(struct device_node *node, #endif #ifdef CONFIG_SMP +static DEFINE_RAW_SPINLOCK(irq_controller_lock); + static int armada_xp_set_affinity(struct irq_data *d, const struct cpumask *mask_val, bool force) {