Received: by 10.223.185.116 with SMTP id b49csp6374362wrg; Wed, 28 Feb 2018 08:22:09 -0800 (PST) X-Google-Smtp-Source: AH8x226dOWj/TDMQURvwATHod3mUy3DTuD9tN2wMIitYgHEjy1s3q2rV0dA6Xm02HL5tOcRuu5qQ X-Received: by 10.99.97.86 with SMTP id v83mr14523783pgb.138.1519834929701; Wed, 28 Feb 2018 08:22:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519834929; cv=none; d=google.com; s=arc-20160816; b=RYxZkQ+ix2QLpcVyO9Z2oCQVRmNRp7qV2Zoz61BRMLwB4M4cHeQPukLJWrNbGBeVXX urs70HAtC11fwQxhw+CiEHaFP4sZW1ma6/MStx9SnE/NmcjFsmIJngn7HKVjryH6ijwV zpEhbaZsNcqi6iPH2LcZB4spjychxa4OXa4J0DZjgovbZ2XpYR/ETtSE6a1Kz9VCbHay BgVS+KnJr8xfInQufsIsGkQfhVZpiQULoMcjtW0MPc0+Ona7sGYgHO0MTRxJcx5oKg76 Jc1UsK4apJuKs5N4IVnONjMwnvUv4AonCg/pRoRZutrt07gWRbywuNh7b6MjyEj02F27 /lAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition :arc-authentication-results; bh=VSwY4BBIrJGRVgBLgfIX7oeQqXKxvgdURxdw0xiFfWI=; b=wlLbto5Xcw1gLEK8vqD2rRaYJm3U9NcORngZi3J/X99URWPMR85Lhdm0lbifFUswhv c/O+FyC92D/6FnP4nxD8jmQs4YB228SqyZZQel9qrM9/e38Hp7O41rt9RjDqb0XRA3+r kj+zos8dzyULQYhmPovvzhtyCp4P7CsBxuFMZucK3SDWJo4gPy/RGCQ27/tHQdx65Bqb AO6Zjkqt7JgKZ36VtmJ96Y+8R9V/z1mYkY2/MvdP3t9SnfYUzpqmMmuigj3dKVtlaIhq VVfxsHGNc8h9vyAs571ut9jvn/dGsswdQoIkCpvCK3O/Va9WYIp2O4g3x0Ru6w97ssOt HbWA== 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 n10si1188350pge.256.2018.02.28.08.21.54; Wed, 28 Feb 2018 08:22:09 -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 S935287AbeB1QVE (ORCPT + 99 others); Wed, 28 Feb 2018 11:21:04 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:35406 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935236AbeB1QU7 (ORCPT ); Wed, 28 Feb 2018 11:20:59 -0500 Received: from [2a02:8011:400e:2:6f00:88c8:c921:d332] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1er3Yr-0006XU-6Y; Wed, 28 Feb 2018 15:22:29 +0000 Received: from ben by deadeye with local (Exim 4.90_1) (envelope-from ) id 1er3Yi-0000BB-9v; Wed, 28 Feb 2018 15:22:20 +0000 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Arnd Bergmann" , "Ulf Hansson" Date: Wed, 28 Feb 2018 15:20:18 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 160/254] mmc: s3mci: mark debug_regs[] as static In-Reply-To: X-SA-Exim-Connect-IP: 2a02:8011:400e:2:6f00:88c8:c921:d332 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.55-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann commit 2bd7b4aacdb6efa5ccd4749c365c171b884791d2 upstream. 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 Signed-off-by: Ulf Hansson Signed-off-by: Ben Hutchings --- drivers/mmc/host/s3cmci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -1537,7 +1537,9 @@ static const struct file_operations s3cm 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), @@ -1559,7 +1561,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,