From patchwork Wed Jan 3 09:26:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 123287 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9951728qgn; Wed, 3 Jan 2018 01:27:41 -0800 (PST) X-Google-Smtp-Source: ACJfBovdmaQC1B5udcsKkJcU0gnPhnJwZdL3A3xZVW3F/MIaPqhUJUWBouaqNMypCOJRXg9HE0Bf X-Received: by 10.101.101.205 with SMTP id y13mr726405pgv.159.1514971661454; Wed, 03 Jan 2018 01:27:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514971661; cv=none; d=google.com; s=arc-20160816; b=WFUvmT2TsIEj3t4dUjPribcIbMIZ5hMsmk+2atzNqvs5ugxApRG1uxAXilihI4gPFs bXyqb/zQTkyfmR7AIVvXUYLhUUxG3GsdinldLjL4EnZ7+vN4z+Rig1PD/bjVkw2iOmnQ ylu/o+lOiqNgX54v4R4VIFMs99Atl7DMxlZMZkbs8N/jINYl3qSnIu0cu1cPzFh5Whwl c7GXJwn5xpw1NF+FLroz6fvydQHCPQk+7bPiZ4jQ7QC5TmMzwG2PJixEZK3FPyLFmpzz MXy9tO/S39tl5azEhc1qtqaxGtpb9chuLJQhmFRXPtPPxX4LjUVg2s2TTdly6LTjAg7e MiNA== 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=2yroTyFbG8JFKX7XMIDEhuRZ4jkCkE4xtcqeRJ0xmdk=; b=QhWOu8qdOgxjVTLzGP2ThryQknh7uTlHKPpQK91H6s2P1AO8EmzXKrzIWLmBuaYEzT qj0eiAWPw3/I0CdFmMm8c9IxjTRbS3UCoVaarnEm2iCvt3K+XRwmTmO8EgF2r5kZHQUI sC28kG/7Q0w5ZE367CMz/TVU+kSWf88NCP7NHo4oLhb+qGi0d1+ixzB1w4+yxElxBpZO lvK21ASd2sTwyMU77PBESwAaMo9sHBStMsRo2zXBEN1acUwWsn1Tb9pU/XY0324GNGWp X3J+D1vdq5UK5l58jz8NhJM3BFui7jyVx1CpEEBRH7eacgNLqO4Y7VIM0DsFbQyxxHE7 bnVQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 l5si416002pgs.301.2018.01.03.01.27.41; Wed, 03 Jan 2018 01:27:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751975AbeACJ1f (ORCPT + 28 others); Wed, 3 Jan 2018 04:27:35 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:55053 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751483AbeACJ1d (ORCPT ); Wed, 3 Jan 2018 04:27:33 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0LoMna-1f8VFY3aXa-00gcTb; Wed, 03 Jan 2018 10:27:07 +0100 From: Arnd Bergmann To: Ben Dooks , Ulf Hansson Cc: Arnd Bergmann , Heiner Kallweit , Julia Lawall , Arvind Yadav , Sergio Prado , linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] s3mci: mark debug_regs[] as static Date: Wed, 3 Jan 2018 10:26:51 +0100 Message-Id: <20180103092705.1949763-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:fdkPEAOrCUt32mCmW5Px8dfQr60o4JXSwfXlVaeXQ+IgMH90LNv cMTSbg857/es0Odes3xvYLYp5lNnHhjZpxxubX4zdiT/zoGsAVeC1IFZRJ4GazW0N8aN9Qr gijA/x2Yvz0X9/BMk86xulO6RxJhdg4C476rTiuKszLaGYdB0FmwO6AWfez0dnh3QGYSKAv 6HpFMt1mGzkl0WpP3D//A== X-UI-Out-Filterresults: notjunk:1; V01:K0:yxHNVn2hli4=:+30GRwXGNXHqXlnCDSPuRc VvmYMpH4Qv+fllp2+YgpFjvOBEOBobPttxlNFRUw10O9rnLTa5pcqNXphNx2qkQmyhUCkG9y+ e2vexJOswPexIfa+iSVkcoPQyMypAADo82kOGpPeYpRYTlXSG8azy75GBwBwCjiRZlud5HJyj ATJT/jJ9//U08UBME6pGiL+Axo+bQU0HARbk/NDVBpBHvUh0+BnWtoLDrTh6eGbFoP2FZf3vo AhbsLFjb7QXWnwUo8WEiGFjJ+ed6QDsMVsaMVBB/8JJsui3tX6+hx0iAexh7q4L4kUbL35JHV yQFukdRKXSh6p6QT2GHr/9p6k6KAC2M3EW7uol1iky5nSPCHxNiukItq8dtbvTsnHKOxOGWXQ Ae2ZoRnTDtocZaRFkjYseNxP7Jlm9myf4R28EJZAtW9qZZle6r/ebJz46XqCo1/1LfRjvwcbY 1iuxs2Sk5ftTLjXpYgn415IkScGKaW53GU4SskT2RjX78U9LAb5rsGvagnmJ88TRG4T69u0pu uyTg+d5hbScH9GUxHlwxgDvEZaktOWTiGmP69x+UeYFgWoO5bGBSzZK79IG7Z7/OeOXly1Pyh +1yjp4dS/AeOklQhFku2bfoCpdMrF57AbetL4EwkVwp3SAnASdAvN0nw5RUGOHSIOeCZwttwJ AOJcq4+lWXWVgSBJ26UuIiI5OPGzqP6UYik7k02wtorgI4SeGyDiaLKbWQIJGix3iQKNXJ4Lq Ur38zQFwshQGiTQEy559BEFBJPYJSB3CQYTXwg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 36daee1e6588..24b27e0957e7 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -1421,7 +1421,7 @@ static const struct file_operations s3cmci_fops_state = { #define DBG_REG(_r) { .addr = S3C2410_SDI##_r, .name = #_r } -struct s3cmci_reg { +static struct s3cmci_reg { unsigned short addr; unsigned char *name; } debug_regs[] = {