From patchwork Tue Sep 23 22:55:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Behan Webster X-Patchwork-Id: 37771 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1A06520792 for ; Tue, 23 Sep 2014 22:55:33 +0000 (UTC) Received: by mail-lb0-f200.google.com with SMTP id u10sf4848242lbd.3 for ; Tue, 23 Sep 2014 15:55:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=nAEVei+hAZQSzKQ88XY19ku0SmXdA0zMw9TucqCUoC0=; b=IjuqSTwoL1Io9LXIpJVjbh9l8RnmOVEC3zbq9/uzQbhYi/pLnA/rbh4mTHvrV4W7Uq UtIRkcagUpAfyY3G+mfTAuIv4K3EfqMd/eFdxGJGoWgj+rvEjEWYd5LImAYxN/bechUQ D1pElvzjrLr54OAa7TXGgCrSROqcGA0BeuKJMV5gJQM8Rwxepw7YP9SUPzSPa5oCaFp9 39eCFekYPtKx7c/9kAiIauEnhrVb3UT4XDd8aoe8y2P6FtE5IwkFQRFEOORyt5u+gEHG wRKDPHkI7hU6JJwpdwtxWcxfpQai9R8JmRzs8TEbWlW1pHCX3wc9pTWfMzfCouz75xE/ 0oGw== X-Gm-Message-State: ALoCoQmf4ugGCg4EmMs35zSN5C+m3MbNZs3Rf5ksjRWncxGcRYr1N2hYhYIoPWrPFqplBoV0nbtf X-Received: by 10.112.132.37 with SMTP id or5mr385714lbb.2.1411512932912; Tue, 23 Sep 2014 15:55:32 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.22.37 with SMTP id a5ls35242laf.42.gmail; Tue, 23 Sep 2014 15:55:32 -0700 (PDT) X-Received: by 10.112.28.8 with SMTP id x8mr10211lbg.104.1411512932775; Tue, 23 Sep 2014 15:55:32 -0700 (PDT) Received: from mail-lb0-x232.google.com (mail-lb0-x232.google.com [2a00:1450:4010:c04::232]) by mx.google.com with ESMTPS id h1si14553904lbf.84.2014.09.23.15.55.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Sep 2014 15:55:32 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::232 as permitted sender) client-ip=2a00:1450:4010:c04::232; Received: by mail-lb0-f178.google.com with SMTP id z12so6993231lbi.37 for ; Tue, 23 Sep 2014 15:55:32 -0700 (PDT) X-Received: by 10.112.76.6 with SMTP id g6mr2523751lbw.22.1411512932493; Tue, 23 Sep 2014 15:55:32 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp496397lbb; Tue, 23 Sep 2014 15:55:31 -0700 (PDT) X-Received: by 10.70.55.42 with SMTP id o10mr2427645pdp.100.1411512931005; Tue, 23 Sep 2014 15:55:31 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u8si23169798pdj.122.2014.09.23.15.55.30 for ; Tue, 23 Sep 2014 15:55:30 -0700 (PDT) Received-SPF: none (google.com: linux-gpio-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756178AbaIWWz1 (ORCPT ); Tue, 23 Sep 2014 18:55:27 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:60673 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756904AbaIWWzZ (ORCPT ); Tue, 23 Sep 2014 18:55:25 -0400 Received: by mail-pa0-f51.google.com with SMTP id eu11so5755413pac.38 for ; Tue, 23 Sep 2014 15:55:25 -0700 (PDT) X-Received: by 10.70.96.74 with SMTP id dq10mr4089012pdb.165.1411512924963; Tue, 23 Sep 2014 15:55:24 -0700 (PDT) Received: from galdor.websterwood.com (S0106dc9fdb80cffd.gv.shawcable.net. [96.50.97.138]) by mx.google.com with ESMTPSA id w8sm13003939pbs.7.2014.09.23.15.55.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Sep 2014 15:55:23 -0700 (PDT) From: behanw@converseincode.com To: bcm@fixthebug.org, chris@printf.net, gnurou@gmail.com, linus.walleij@linaro.org, mporter@linaro.org, ulf.hansson@linaro.org Cc: bcm-kernel-feedback-list@broadcom.com, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, rjui@broadcom.com, Behan Webster Subject: [PATCH v2 2/2] mmc, sdhci, bcm-kona, LLVMLinux: Remove use of __initconst Date: Tue, 23 Sep 2014 15:55:08 -0700 Message-Id: <1411512908-19237-2-git-send-email-behanw@converseincode.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1411512908-19237-1-git-send-email-behanw@converseincode.com> References: <20140923212922.GG12270@beef> <1411512908-19237-1-git-send-email-behanw@converseincode.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-gpio@vger.kernel.org X-Original-Sender: behanw@converseincode.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::232 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@ Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Behan Webster The __initconst is in the wrong place, and when moved to the correct place it uncovers an error where the variable is used by non-init data structures. Instead merely make them const and put the const in the right spot. Signed-off-by: Behan Webster Reviewed-by: Mark Charlebois Acked-by: Arnd Bergmann Acked-by: Matt Porter --- drivers/mmc/host/sdhci-bcm-kona.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c index dd780c3..4bb06c8 100644 --- a/drivers/mmc/host/sdhci-bcm-kona.c +++ b/drivers/mmc/host/sdhci-bcm-kona.c @@ -225,7 +225,7 @@ static struct sdhci_pltfm_data sdhci_pltfm_data_kona = { SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN, }; -static struct __initconst of_device_id sdhci_bcm_kona_of_match[] = { +static struct of_device_id const sdhci_bcm_kona_of_match[] = { { .compatible = "brcm,kona-sdhci"}, { .compatible = "bcm,kona-sdhci"}, /* deprecated name */ {}