From patchwork Thu Sep 25 22:45:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Behan Webster X-Patchwork-Id: 37936 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9C01D202DB for ; Thu, 25 Sep 2014 22:45:37 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id l4sf6937871lbv.4 for ; Thu, 25 Sep 2014 15:45:36 -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=fJW1Pq/y1AdSkOVIFnmNNIncZipVz49yRgGMKiDBlVA=; b=Vob8jTBSCJerLvpCi9tD2S60evVlOVIFMD9JCOg9LbYTEUa4DTvxgNreOcZFMp5cfO nq/ZKXwIn8Rrh/pk2JzLkrU3y1IRFrMT7ceuCSAGZLVRdEjJz4mXxcC5LsymS0xoac/M Yk7/U8Yp4YZxDIT0WmQHTzr9rFELn/Atmp8FE5x/uABwPY4g+p40GgkrVXO+7B0fwgbE 9AhrvpE5e2nZZ5v/gO6bdJ+/udicRKX/6SF6VaVVtxli/sLaq1gEqR/kp+lK4faYm03Y j8KF1+E05dxfsRk7t0Cv7w0nSkag4amRl4kROVmPCqWkVlB16xBOvj8oqpLzTBdRYZvo IDYg== X-Gm-Message-State: ALoCoQnzQRFkKkm1g72Kk3CVCgyzOfMp9toM/0jTWkApRZvLnOqzQChsl20qBEiN2KlK217axJDa X-Received: by 10.180.109.194 with SMTP id hu2mr3002493wib.1.1411685136361; Thu, 25 Sep 2014 15:45:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.9.130 with SMTP id z2ls32978laa.61.gmail; Thu, 25 Sep 2014 15:45:36 -0700 (PDT) X-Received: by 10.112.161.135 with SMTP id xs7mr15333096lbb.13.1411685135987; Thu, 25 Sep 2014 15:45:35 -0700 (PDT) Received: from mail-lb0-x22b.google.com (mail-lb0-x22b.google.com [2a00:1450:4010:c04::22b]) by mx.google.com with ESMTPS id mn8si4788140lbb.102.2014.09.25.15.45.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 25 Sep 2014 15:45:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::22b as permitted sender) client-ip=2a00:1450:4010:c04::22b; Received: by mail-lb0-f171.google.com with SMTP id l4so13549725lbv.30 for ; Thu, 25 Sep 2014 15:45:35 -0700 (PDT) X-Received: by 10.112.235.199 with SMTP id uo7mr15704361lbc.50.1411685135694; Thu, 25 Sep 2014 15:45:35 -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 of9csp835023lbb; Thu, 25 Sep 2014 15:45:35 -0700 (PDT) X-Received: by 10.70.40.229 with SMTP id a5mr32949223pdl.17.1411685134161; Thu, 25 Sep 2014 15:45:34 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y2si6051445pdj.118.2014.09.25.15.45.33 for ; Thu, 25 Sep 2014 15:45:34 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S1752192AbaIYWpa (ORCPT + 27 others); Thu, 25 Sep 2014 18:45:30 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:35489 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751783AbaIYWp3 (ORCPT ); Thu, 25 Sep 2014 18:45:29 -0400 Received: by mail-pd0-f178.google.com with SMTP id ft15so11554385pdb.9 for ; Thu, 25 Sep 2014 15:45:28 -0700 (PDT) X-Received: by 10.66.219.138 with SMTP id po10mr24127675pac.88.1411685128769; Thu, 25 Sep 2014 15:45:28 -0700 (PDT) Received: from galdor.websterwood.com (S0106dc9fdb80cffd.gv.shawcable.net. [96.50.97.138]) by mx.google.com with ESMTPSA id w7sm2108699pbs.4.2014.09.25.15.45.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Sep 2014 15:45:27 -0700 (PDT) From: Behan Webster To: bcm@fixthebug.org, chris@printf.net, mporter@linaro.org, ulf.hansson@linaro.org Cc: behanw@converseincode.com, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org Subject: [PATCH v3] mmc, sdhci, bcm-kona, LLVMLinux: Remove use of __initconst Date: Thu, 25 Sep 2014 15:45:22 -0700 Message-Id: <1411685122-21867-1-git-send-email-behanw@converseincode.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <5774775.2EcFmuR4sV@wuerfel> References: <5774775.2EcFmuR4sV@wuerfel> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@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::22b 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: , 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..d085dfe 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 */ {}