From patchwork Wed Jan 3 22:49:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 123365 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp10731056qgn; Wed, 3 Jan 2018 14:50:12 -0800 (PST) X-Google-Smtp-Source: ACJfBovWPNaK2LOB1vXayAI9NYJtylWvU9b8Shu39kBFSSFN/7IEJsx73KGzcqefN7aclxtwitzo X-Received: by 10.99.189.65 with SMTP id d1mr2364966pgp.402.1515019812297; Wed, 03 Jan 2018 14:50:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515019812; cv=none; d=google.com; s=arc-20160816; b=iJ7VWNgSkR2r6jqKtK6rd2laoAZOSqaU30mGF5JQKeWQFC/li6MAPmmpLShGNYT67O dmrwJn+/Ug3cKTacFqyGd/aw9p4j1+6pV4YF5rPbQmQIU23/uQ0aaJxHXI2D6FRiBamT yX+zScI9my74xKMpy0rD2ibpYyHjCdAS71iu8GDUB8tAa4p6a3VPzQyjkw8OzhGe1uxE BmMhSQz+Pn6Rce0Y1i4oM9ifKpUGzZ87z0VsaXW5/UVyWs86XzzPfP+GLSoingjcxFhK zq1WhPn1YhGSdfeNYcC7Wc0aw99xUNeXVnM27JCdjE9y61fOaJa5k+jVdrDF8XVhch07 9GbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=p2K/SryAeJyJYq4V067NDh8lS1bFe4Qja820lvvypLY=; b=x3xMl+trRBplhv1M9Ls087gDU/M/gnvQgbac7MH8djhZnghHpBqv1YgIxd4FPR2q2X Mz9FiwDwsky2JOK4/IvGk4ERW9N2Q9FgoGvowf/PNyPU+bS2U5DBhorXhvEeD3VLqMv7 kRxxA2K+4OuFttHccWnMaHvML10touPuhwTloS259d3Zm/pZr4uhN0s8VRoO+Ww8RB6s YrYOcN4aUmJPlpatU2q3oZ05XKf0xz5/BzpttoeO4ZxX37QGh81xdMGmVffNulQGZMso INRgdYOTLhgdpvjeBBxInNuxHQ1hVd+sIEOZyTUr11duVnD1m4e8oCnJX7HvzdGnsG8L g0sA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f4si1183508pgv.592.2018.01.03.14.50.12; Wed, 03 Jan 2018 14:50:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751053AbeACWuL (ORCPT + 6 others); Wed, 3 Jan 2018 17:50:11 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:64155 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750913AbeACWuK (ORCPT ); Wed, 3 Jan 2018 17:50:10 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id 0M3wNK-1ep5GB2A6s-00rZ2E; Wed, 03 Jan 2018 23:49:41 +0100 From: Arnd Bergmann To: Ben Dooks , Ulf Hansson Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [v2] s3mci: mark debug_regs[] as static Date: Wed, 3 Jan 2018 23:49:18 +0100 Message-Id: <20180103224939.4104207-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:BOb1o7CmdsCGuFjILiSfMQdq4wnd+DO71MuFhw11OdyyC6QlaIh xN+z4UQT/2b+AjxkxEJg6RdC3qEacL3SLqQSBrWfoj9cjVnYpsl6cQyR/Hddkwwyadjiab3 x+j7em2mQNMvXG2P8X/yZ07xhlMmZ/0iGLpEjqRP1E/ZhU272YYtHiOmRKn8qvfBxohF3wn aUgrSzxM1+mPi+LyjiZIw== X-UI-Out-Filterresults: notjunk:1; V01:K0:xdYnYhXU63Y=:38BBQySa1baZr5AIRYF8iP vdQ0sVv71wlTi3InqSKWMVHGE37bMtCvZl+PZeN1p14UOZHaettVwa2vq6vCNLJsSyUkurE9F leDdcvyxbP9lgHYiPSZbeGHcJknjCIIWabEHkX+767gWVrXqHFb1OpdAXj9il2j3AL2BOZvNh hwJ8qNfxNx5HTn1bbOV62wP2qsr8ymtqvr7bhQIlP/8LxTJgQ3sCuecNt9P/ZyuQypPgBmUTL 9G3FoAVSCYEzRxqkpTvuPZy5baVQ1ngXMwwanyMCtQvaZxR6c5zKb+u+p9YKX+cQIjPuv5czM +FMNAHIktisFyPZwKCKurS2huJ0QrNym2g66IbGEcWpNu2nJUD2UkroRUzjqG31O0TCJ3CiXj oAX1Z4qELuVigtnxzB6Ou9Dj2AXpmmzPxgV0YXCgsnF5KQYIkqy4wITBeKDNRh6IUTiLGpg2+ BNIHrbSMow0nK0IglTxjh0+fNb/cenam+TXH1jrRm9G9uytvIp1m6wrHyMubJ/qcyGeTUxOzz bN/OvPFxXy9xHiIfWmho2qAPqI9AaETYRuiV0RZqljkJpFrd2TBING2wpgTxFYpJOnFTJqrXx ZSneo7e5lac/qxR7WaC8ta4F9Nw9jBm1cxDSBVDbXRWJsDpURyXozH5a3PWe1MYyKfzcsJ2Fq hdcAQ+e1oRtdbX/YU/Z76HQnWaVyYcScFmIxltsNxQrNUbs/XdU2kXJsJ5id5zoEd5VMQf5c6 V53ZnKoAphGfxj/pJtXDOio+KapnumZbSV/SpPVOVQ8onOSD7n6jkDbWNeU= Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org The global array clashes with a newly added symbol of the same name: drivers/staging/ccree/cc_debugfs.o:(.data+0x0): multiple definition of `debug_regs' drivers/mmc/host/s3cmci.o:(.data+0x70): first defined here We should fix both, this one addresses the s3cmci driver by removing the symbol from the global namespace. While at it, this separates the declaration from the type definition and makes the variable const. Fixes: 9bdd203b4dc8 ("s3cmci: add debugfs support for examining driver and hardware state") Fixes: b3ec9a6736f2 ("staging: ccree: staging: ccree: replace sysfs by debugfs interface") Signed-off-by: Arnd Bergmann --- drivers/mmc/host/s3cmci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 36daee1e6588..f77493604312 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -1424,7 +1424,9 @@ static const struct file_operations s3cmci_fops_state = { struct s3cmci_reg { unsigned short addr; unsigned char *name; -} debug_regs[] = { +}; + +static const struct s3cmci_reg debug_regs[] = { DBG_REG(CON), DBG_REG(PRE), DBG_REG(CMDARG), @@ -1446,7 +1448,7 @@ struct s3cmci_reg { static int s3cmci_regs_show(struct seq_file *seq, void *v) { struct s3cmci_host *host = seq->private; - struct s3cmci_reg *rptr = debug_regs; + const struct s3cmci_reg *rptr = debug_regs; for (; rptr->name; rptr++) seq_printf(seq, "SDI%s\t=0x%08x\n", rptr->name,