From patchwork Tue Mar 12 16:46:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2257221 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 7B5BBDF23A for ; Tue, 12 Mar 2013 16:51:06 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UFSMo-0004Cr-Mu; Tue, 12 Mar 2013 16:47:58 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UFSLm-000415-Op for linux-arm-kernel@lists.infradead.org; Tue, 12 Mar 2013 16:47:00 +0000 Received: from wuerfel.lan (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0MekHI-1UQMQG0Pf6-00OVAK; Tue, 12 Mar 2013 17:46:52 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 10/13] ARM: spear: rename duplicate pl080_plat_data Date: Tue, 12 Mar 2013 17:46:53 +0100 Message-Id: <1363106816-9603-11-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1363106816-9603-1-git-send-email-arnd@arndb.de> References: <1363106816-9603-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:NciqOnSYTVXFbchJ3E7FrPrpE9wMIF9cyfnylfKmvAl vqeIbsRQaYqTMGFXunRlrKqj8Lb1rd4lleuxoTqsM/1qWl4Fjr sKgMnpQc3sPymM4bxcF/t25F5T+xa2ij7+xE2Ay9JAh70tH7JA ViUs0oHs91plSbB0U09L9/fQxrNEyjXiEJnC3hQNE89JAF7feu RZKD2jbT4gjMtag0fU0+0wngiefZ40lhvc/M5HT9oNqUGF6IQ5 2mFX7y8mhqscHI4M8BQizVju8Qihg0QKCg7iqO/pJiEYMjkZEr Fhjhdyq9CN1zOpDuDTcCiIrUNXqy+zIbCDtzUi+qvQSkMrCBa4 /4PAqtLMLfkgDsBeAU9tsbBUGtmC/xorBVdKHKYJC X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130312_124655_207405_272EF5A7 X-CRM114-Status: GOOD ( 11.31 ) 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.17.10 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] Cc: vipulkumar.samar@st.com, spear-devel@list.st.com, 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Both spear3xx and spear6xx have a global symbol named pl080_plat_data. Eventually, both should be removed, but for now, we can rename one to pl080_plat_data and declare it static, since that one does not actually need to be visible outside of spear6xx.c. Signed-off-by: Arnd Bergmann Acked-by: Viresh Kumar --- arch/arm/mach-spear/spear6xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-spear/spear6xx.c b/arch/arm/mach-spear/spear6xx.c index 9b5ea25..ec8eefb 100644 --- a/arch/arm/mach-spear/spear6xx.c +++ b/arch/arm/mach-spear/spear6xx.c @@ -322,7 +322,7 @@ static struct pl08x_channel_data spear600_dma_info[] = { }, }; -struct pl08x_platform_data pl080_plat_data = { +static struct pl08x_platform_data spear6xx_pl080_plat_data = { .memcpy_channel = { .bus_id = "memcpy", .cctl_memcpy = @@ -406,7 +406,7 @@ void __init spear6xx_timer_init(void) /* Add auxdata to pass platform data */ struct of_dev_auxdata spear6xx_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("arm,pl080", SPEAR_ICM3_DMA_BASE, NULL, - &pl080_plat_data), + &spear6xx_pl080_plat_data), {} };