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: 392691 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D01F21400A0 for ; Wed, 24 Sep 2014 08:55:30 +1000 (EST) 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=converseincode.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wC26bTJ04J8oDf9YX6G5S5qe5ei+aeP3ccmKIkT7oL8=; b=aH40loeyjiXzVE/vSH/wbJvszXqAXd2xyfERFJI14JT70j6/Q5TZ2QAZTodgtSSAV2 VY+VuG/oh5Wl8xLu5w83HHRV1pF4Bh92MdREs4Kijp3GPxqb2ydWP+31mGGi2kKC73dV pzSnU5lNLG7e3SZwIFc3nIlaJmt8KsoJPwqhY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wC26bTJ04J8oDf9YX6G5S5qe5ei+aeP3ccmKIkT7oL8=; b=SZ5teO4xLhT4Stwp6J4SGnBNJlNnBDLc6GLNe95q6q3Ob7plBQ0qykGF8Uq909aRsD zT6TRzBDAK13mp4wzG/+omkBWNfxTwdmjuLV3RlpGN61xALhWl+j4S6jDaHVrQJNoU5+ pCMBH/DVKSx5wM3kNndyetpnvFZmZlhkn8VtWfCsTXc75aUZSgmjUN6oKlrTSTwKO59U OZkU/j4YpU6hlBb3h2xZhTv5JhoT87e+Bfe90kIELKXJftXVMJ6lihDAB2LbVr0ieJ0W qLwoGlJoQ+AcKRsMrpfWSclsm0jFqSnxVW+w2nGoByvBpF0YxTJUX7/KanwRTTBSVb14 LNEg== X-Gm-Message-State: ALoCoQl0Oj+unltw6N6PMMD7FK40JrAhEU4A9iaPa7YH/zUmQQrgJgSi8nXq9ZEV9vZnxJg8wWsY 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: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org 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 */ {}