From patchwork Fri Oct 5 14:55:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12014 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 958AE23E57 for ; Fri, 5 Oct 2012 14:56:12 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id DEFFCA190E6 for ; Fri, 5 Oct 2012 14:56:11 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so3893275iej.11 for ; Fri, 05 Oct 2012 07:56:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=YyaLtBdHyslUiolCsxJDrcGzrt4Ic2Stwe5lArIZiM8=; b=HJMOlj3pWB15jV9seD3O0JcONYhfVrFjGyc1PGhDe+1K3ABT6DDpOGc2quiLtx6GAs EXPinmUKDRhht1LVs7KhoLM3cFKPuPvESnY/g0pD+T3wpSYsHGtrLLXxmhrda5NHWm6h SvsorA8l/Mb6d4Toni/5JbduFbYyF8MQB99zrHTmmrbJkF1LHIXKWqV5Z7frgvP8hHeR YOxllhEgYT+qgAT+cdkm/dwmJ2AT4vtYTRZmhYB47khxZdjhf2BztALC+PInf5I5CEyZ EP4lhHdUTMiQ69TpHk+r0re163PvLzRnump4r8iiTi2me8qTvtdhRLksFCI3al+9Di+L fQ7A== Received: by 10.50.0.193 with SMTP id 1mr1444473igg.0.1349448970260; Fri, 05 Oct 2012 07:56:10 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp130633igc; Fri, 5 Oct 2012 07:56:09 -0700 (PDT) Received: by 10.180.87.34 with SMTP id u2mr3945011wiz.3.1349448968732; Fri, 05 Oct 2012 07:56:08 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.186]) by mx.google.com with ESMTPS id q79si6771667wen.24.2012.10.05.07.56.08 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 07:56:08 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.186 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.186; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.186 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from klappe2.boeblingen.de.ibm.com (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0MK8g5-1TJJy42HBd-001PCT; Fri, 05 Oct 2012 16:55:49 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, arm@kernel.org, Arnd Bergmann , Dominik Brodowski , Russell King , Pavel Machek , linux-pcmcia@lists.infradead.org, Jochen Friedrich , stable@vger.kernel.org Subject: [PATCH 11/16] pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops Date: Fri, 5 Oct 2012 16:55:25 +0200 Message-Id: <1349448930-23976-12-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1349448930-23976-1-git-send-email-arnd@arndb.de> References: <1349448930-23976-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:nn8BWbPO460Y2W01upUc5AGLGbxLrVGDwBGKkgYjjp3 FnZwlHTwnwXvEw1O/XVunK+GyOXI/arIZztHiT0phOdY6lKAgz ylBHEJaW5ycKzT2Wm1HHnxy6RV0o6yi7hn5eXjbR/XL7ekgbZW 82Fyn5J9h3xSvVc2zBWySavYALbLHSymdCDFevrCze8PTkdksx 1TAEY/cb+WbtWyDH2rkPKcpCqfGFyyqtt5Z6j0ZPb/eMpj1/JW MTEfmq1wK1HwUjnS8jb9qq3eUMFA14uT+1yP0DusHVw084HCOW mvNZ3tIPocrrmHJqwQ17kMWd+wGwFWOrwkhBx8bg7+BdrLST+S k1/AF1p1z9/MtGmZdrv666N811RHO5P3I3CcNqaTLrzZnUuMSM OtNn2k1xBymH02uetIJcVSgh1o757m+W+8= X-Gm-Message-State: ALoCoQmhjT4qLCVUnlUxgpSFFok0cRxRs/n9Yk2aebdfr5TBOrKcx/QJKIM/k9u3VZFUb/dkeMVm The sharpsl_pcmcia_ops structure gets passed into sa11xx_drv_pcmcia_probe, where it gets accessed at run-time, unlike all other pcmcia drivers that pass their structures into platform_device_add_data, which makes a copy. This means the gcc warning is valid and the structure must not be marked as __initdata. Signed-off-by: Arnd Bergmann Cc: Dominik Brodowski Cc: Russell King Cc: Pavel Machek Cc: linux-pcmcia@lists.infradead.org Cc: Jochen Friedrich Cc: stable@vger.kernel.org --- drivers/pcmcia/pxa2xx_sharpsl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c index b066273..7dd879c 100644 --- a/drivers/pcmcia/pxa2xx_sharpsl.c +++ b/drivers/pcmcia/pxa2xx_sharpsl.c @@ -194,7 +194,7 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) sharpsl_pcmcia_init_reset(skt); } -static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = { +static struct pcmcia_low_level sharpsl_pcmcia_ops = { .owner = THIS_MODULE, .hw_init = sharpsl_pcmcia_hw_init, .socket_state = sharpsl_pcmcia_socket_state,