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: 10143621 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 048C66034B for ; Wed, 3 Jan 2018 22:50:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E333F293E2 for ; Wed, 3 Jan 2018 22:50:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D801529402; Wed, 3 Jan 2018 22:50:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 90F9129401 for ; Wed, 3 Jan 2018 22:50:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=nMfd6p7i9SDL1pcmYkO8RE4LQmEX2pJJE7ZHxYOONHA=; b=hZQ 1ArlIsuyTBlMsQtLovYe6kOULzRHIu227QO+Rw/RVSPpBNBGjTLc57NtjGRAsdNkiuboBuEQAsZNR qqoJkiPdBQdpSPu5ScwXRL1oEV+CU21K+N7cWNZfN50tdU7MGyJsQYOQ+KEYw5Y2ms+RtjFQ86oB8 sJVQaZ0wGqjUlQktXG0O19fI4ADnyaxwBNghH/UaN7nuTi6AnRn84Jfv9KuuEgiiSXKTrkxU5sHjl jyidSMzuSJHlC8afAyQU1es1bssPH6OR4NUoZo5byQ7Bu90ikjc3r6wwgCRN7h+xed/ATtYkD61Wm IGkUmO4am1ghy0pAGGfV+Gf2OA+OUKA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eWrrO-00082Q-8n; Wed, 03 Jan 2018 22:50:10 +0000 Received: from mout.kundenserver.de ([212.227.126.131]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eWrrI-0006m7-Td for linux-arm-kernel@lists.infradead.org; Wed, 03 Jan 2018 22:50:08 +0000 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 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= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180103_145005_375863_093A2492 X-CRM114-Status: GOOD ( 11.82 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Arnd Bergmann , linux-kernel@vger.kernel.org MIME-Version: 1.0 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 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(-) 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,