From patchwork Mon Feb 24 05:52:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 3706351 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 B6FAABF13A for ; Mon, 24 Feb 2014 05:51:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DBF7F20160 for ; Mon, 24 Feb 2014 05:51:30 +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 0987D2010F for ; Mon, 24 Feb 2014 05:51:30 +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 1WHoRo-0006Rk-To; Mon, 24 Feb 2014 05:51:25 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WHoRm-0008CE-A7; Mon, 24 Feb 2014 05:51:22 +0000 Received: from mail-pa0-x234.google.com ([2607:f8b0:400e:c03::234]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WHoRi-0008BM-Qq for linux-arm-kernel@lists.infradead.org; Mon, 24 Feb 2014 05:51:19 +0000 Received: by mail-pa0-f52.google.com with SMTP id bj1so6095144pad.39 for ; Sun, 23 Feb 2014 21:50:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:subject; bh=muSdfZ/S1XMbwfENJFXazCBxhDRXTyeBoLmH3F8jr8k=; b=iOuMR6hn+ITIFh4Fz4umbtSnWiHsUbfq1Otj8xiuEEdw1h11qE8Y6ut3i09JdagdqK IRouZ26ZyF94yCGHZ9Y0Hhb+EsJbkPjofZQttShqEaPNcTgBjG2jGQfxMsVpeZxb8D37 qtu1d5Fq0r5vqwQBgV4eB/fy7wOuLEEuVj6qC2nH6FdRRfw7iNG/8KF+PUs6/LvcvTfp 0WlhC8FRFs0FM/XYVAVm2MWhrz7vDLjXl/ofVP45KpmdbLVBqkej1CK71IpVTv0/43R4 dJSKcYnQnx31HOUtJnA3jSOZm5f0JdR9Gihp7LnlYrhDOGpEQ2hU6z3ApMtoZcfCb7Jm rOiQ== X-Received: by 10.66.192.133 with SMTP id hg5mr23273395pac.122.1393221056956; Sun, 23 Feb 2014 21:50:56 -0800 (PST) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id j3sm46008109pbh.38.2014.02.23.21.50.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Feb 2014 21:50:55 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Mon, 24 Feb 2014 14:52:12 +0900 Message-Id: <20140224055212.1822.52295.sendpatchset@w520> Subject: [PATCH] ARM: shmobile: Move SYSC base variable to inside ifdefs X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140224_005119_011010_A075A890 X-CRM114-Status: UNSURE ( 8.90 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) Cc: horms@verge.net.au, Magnus Damm , linux-arm-kernel@lists.infradead.org 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Magnus Damm Move the rcar_sysc_base variable to inside #ifdefs to avoid triggering build warnings in case PM or SMP is not selected. Signed-off-by: Magnus Damm --- Depends on "[PATCH 00/12] ARM: shmobile: Rework include path for SoC files" arch/arm/mach-shmobile/pm-rcar.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- 0013/arch/arm/mach-shmobile/pm-rcar.c +++ work/arch/arm/mach-shmobile/pm-rcar.c 2014-02-24 14:09:44.000000000 +0900 @@ -15,8 +15,6 @@ #include #include "pm-rcar.h" -static void __iomem *rcar_sysc_base; - /* SYSC */ #define SYSCSR 0x00 #define SYSCISR 0x04 @@ -35,6 +33,7 @@ static void __iomem *rcar_sysc_base; #if defined(CONFIG_PM) || defined(CONFIG_SMP) +static void __iomem *rcar_sysc_base; static DEFINE_SPINLOCK(rcar_sysc_lock); /* SMP CPUs + I/O devices */ static int rcar_sysc_pwr_on_off(struct rcar_sysc_ch *sysc_ch,