From patchwork Tue Sep 23 19:30:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Behan Webster X-Patchwork-Id: 37753 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f198.google.com (mail-we0-f198.google.com [74.125.82.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1B8EA20970 for ; Tue, 23 Sep 2014 19:30:28 +0000 (UTC) Received: by mail-we0-f198.google.com with SMTP id t60sf2881741wes.9 for ; Tue, 23 Sep 2014 12:30:27 -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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=ieeQy/G4ED2mQFNhmMUALvC0R5td5vXzH9Gin+WmqYs=; b=ZGQuX62ZO4lWMsL6uJDBUskNoNBGrHGL6h1CATsBT9l8nK6VPy5EKuwwszga1UCWbb ln9m6wAbJwJDx3UJrcZ0jiHit6LmONQ2egMI1re4QBSd8jLdgS0g++cHz4hF8o6clPIF pALPpFCfjtKkb6mCheRLw5mYp7p8bXG7PUInKVSwiAIwV6pE+Juh4RfA09V8Pu1TWpj5 P1r8lw68JrD7MKFhXTyHOn3PAr3C6ULzEEPeeyVioCHuIqhcNTdU49r7K8rU+lvQsPBi Ettehg8K7c2NMaqr+Wm2lZHQTjlFENTgC9XysdH6V2UkxSxPJd53nispvp+/Pd4IEqAI EIEA== X-Gm-Message-State: ALoCoQlq8PhcZTQi0NDMmJbOsdzwjRRTx41/CDaUKVIFYcWDc0+dZzbQqJjY4/rJdL+DqDliOzL4 X-Received: by 10.112.118.8 with SMTP id ki8mr262132lbb.4.1411500627203; Tue, 23 Sep 2014 12:30:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.5.12 with SMTP id ci12ls76024lad.48.gmail; Tue, 23 Sep 2014 12:30:27 -0700 (PDT) X-Received: by 10.112.52.68 with SMTP id r4mr1568150lbo.31.1411500626994; Tue, 23 Sep 2014 12:30:26 -0700 (PDT) Received: from mail-la0-x22c.google.com (mail-la0-x22c.google.com [2a00:1450:4010:c03::22c]) by mx.google.com with ESMTPS id x7si19939901lax.124.2014.09.23.12.30.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Sep 2014 12:30:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::22c as permitted sender) client-ip=2a00:1450:4010:c03::22c; Received: by mail-la0-f44.google.com with SMTP id q1so9438724lam.3 for ; Tue, 23 Sep 2014 12:30:26 -0700 (PDT) X-Received: by 10.152.7.8 with SMTP id f8mr1618862laa.27.1411500626873; Tue, 23 Sep 2014 12:30:26 -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 of9csp472541lbb; Tue, 23 Sep 2014 12:30:26 -0700 (PDT) X-Received: by 10.66.197.132 with SMTP id iu4mr2449332pac.132.1411500625385; Tue, 23 Sep 2014 12:30:25 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zz2si22472755pbc.124.2014.09.23.12.30.24 for ; Tue, 23 Sep 2014 12:30:25 -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 S1756124AbaIWTaY (ORCPT ); Tue, 23 Sep 2014 15:30:24 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:41445 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756011AbaIWTaX (ORCPT ); Tue, 23 Sep 2014 15:30:23 -0400 Received: by mail-pa0-f52.google.com with SMTP id hz1so7038852pad.25 for ; Tue, 23 Sep 2014 12:30:22 -0700 (PDT) X-Received: by 10.70.60.169 with SMTP id i9mr3055707pdr.166.1411500622639; Tue, 23 Sep 2014 12:30:22 -0700 (PDT) Received: from galdor.websterwood.com (S0106dc9fdb80cffd.gv.shawcable.net. [96.50.97.138]) by mx.google.com with ESMTPSA id ve13sm12881347pac.6.2014.09.23.12.30.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Sep 2014 12:30:21 -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] gpio, bcm-kona, LLVMLinux: Remove use of __initconst Date: Tue, 23 Sep 2014 12:30:16 -0700 Message-Id: <1411500616-12863-1-git-send-email-behanw@converseincode.com> X-Mailer: git-send-email 1.9.1 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:c03::22c 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/gpio/gpio-bcm-kona.c | 2 +- drivers/mmc/host/sdhci-bcm-kona.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c index 3f6b33c..de0801e 100644 --- a/drivers/gpio/gpio-bcm-kona.c +++ b/drivers/gpio/gpio-bcm-kona.c @@ -496,7 +496,7 @@ static struct irq_chip bcm_gpio_irq_chip = { .irq_release_resources = bcm_kona_gpio_irq_relres, }; -static struct __initconst of_device_id bcm_kona_gpio_of_match[] = { +static struct of_device_id const bcm_kona_gpio_of_match[] = { { .compatible = "brcm,kona-gpio" }, {} }; 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 */ {}