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: 392645 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 2986A140076 for ; Wed, 24 Sep 2014 05:30:25 +1000 (EST) 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=converseincode.com; s=google; h=from:to:cc:subject:date:message-id; bh=q7K7edaovdufXMTevTPcQM23QueVVtyD8lnUCMBG6zA=; b=b2vqUDu9G70ldStL2lpEf5k2I5omUY2RyTwECQKa4sLq5EK5uKL2Fma4EK58Y5SH2K CknbGoatTeEJXZdbto1rqH3K2tiTtKSDKCxqg/RgBCgiNxsnYqoPV1BxrBrZxi0WO/UC v8ByD2he0Kif6UHu8aU4iDnJgo385gWHH6+NA= 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; bh=q7K7edaovdufXMTevTPcQM23QueVVtyD8lnUCMBG6zA=; b=RE/2tT24ZgmE00iGtsWz/cdawBtZl0KYicpEobCpPg1rkkjtVbwEqCHwbpTpO5d438 xZA7Z8QySV3LJPt+EQDOYh2DqWBy9Cr28MyyJx0NcL0HhmIyVXzYTuLeO+P7iq1drDr/ qttXsniXClXo3uysvIofzkW+Z3sw8fj+YjdVklWdYCAEfs4WY3BaIJMjP0ma2VK1VpO0 wr9WaYK52fOXr3gAq88b+Z5AjVSLiOoyxkpJyjATMhTgX39IgLa7Y+7MbCusNklDPgxk H/EThfnzMGQq1rxMYmTIYQAiaW/qNHWeKJTFkMqjx+wV/+UDK+Ezzs2/5wmlOiksaGVR +bzw== X-Gm-Message-State: ALoCoQnvJTdwGzflaIbmVCv+i7gAetbEwrm58tnCbsHJRLCYe/785vuKXo1TuouDX5h+AfxZ42uD 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: 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/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 */ {}