From: Behan Webster <behanw@converseincode.com>
Date: Thu, 25 Sep 2014 22:45:22 +0000 (-0700)
Subject: mmc, sdhci, bcm-kona, LLVMLinux: Remove use of __initconst
X-Git-Tag: v4.14-rc1~6707^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3f635ad6648d17178c3e2ab2f0a4823fcac1e83;p=platform%2Fkernel%2Flinux-rpi.git

mmc, sdhci, bcm-kona, LLVMLinux: Remove use of __initconst

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 <behanw@converseincode.com>
Reviewed-by: Mark Charlebois <charlebm@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
index 2245988..e7e4fbd 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 const struct of_device_id sdhci_bcm_kona_of_match[] = {
 	{ .compatible = "brcm,kona-sdhci"},
 	{ .compatible = "bcm,kona-sdhci"}, /* deprecated name */
 	{}