From patchwork Tue Oct 9 20:13:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12082 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 9841A23F6D for ; Tue, 9 Oct 2012 20:14:13 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 49E9BA18878 for ; Tue, 9 Oct 2012 20:14:13 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so1111492iag.11 for ; Tue, 09 Oct 2012 13:14:12 -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=zsBuwBULpy0RWXfOdNEadmmdGnDms6wbF9o6ypx59LM=; b=QGSp6KtreMudL6oAbQUtUvayA7OtImkNr2hturAXTLWB/FLmuhiBBGfqig9EEFAy1T YvCaBmX19cAB0Ji0h9acMyChD/EqnX0TVMbOE9I02BUvlhyjeiP0WLMRuJ3bZkT4hGw0 eRIz1KhqtKkPryTcI3+ZlrVtV19s1wJhpv//yrdxWZQ6dchhOiwnxM1o4EtFFyiaJoWd K0PdgWja0UiLWvNAx0Ut0dJ+lYGJvioFPUrMTgj1PU6CcfIE+XqVI5599Cg0csrXKLFa +hjuhqQjCaZQyFbVRsHrBVHZj8edyLRihOrRtI/AJCH7naYlYpMzbCt+h1QYtHEmoiOJ l6mA== Received: by 10.50.159.194 with SMTP id xe2mr2946081igb.62.1349813652696; Tue, 09 Oct 2012 13:14:12 -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.67.148 with SMTP id n20csp113884igt; Tue, 9 Oct 2012 13:14:11 -0700 (PDT) Received: by 10.205.126.16 with SMTP id gu16mr7010842bkc.67.1349813651343; Tue, 09 Oct 2012 13:14:11 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.8]) by mx.google.com with ESMTPS id go13si40126040bkc.123.2012.10.09.13.14.10 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 09 Oct 2012 13:14:11 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.8 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.8; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.8 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from klappe2.lan (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0LmRkt-1TvZ6c2qRv-00aC2N; Tue, 09 Oct 2012 22:14:06 +0200 From: Arnd Bergmann To: arm@kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Dominik Brodowski , Russell King , Pavel Machek , linux-pcmcia@lists.infradead.org, Jochen Friedrich , stable@vger.kernel.org Subject: [PATCH v2 6/8] pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops Date: Tue, 9 Oct 2012 22:13:56 +0200 Message-Id: <1349813638-4617-7-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1349813638-4617-1-git-send-email-arnd@arndb.de> References: <1349813638-4617-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:QzzISXOVjBuGfD6krTrEAj8c5WNDPtA0uwxYGchQqfD LPfXlsE22tEcA0mz0D6qVTM7Pf5pSRo/YmQk30MAb2DpNVmWdF umK3b1fosO9g/g7OEeSec4A4pf1712fvWv+Kes0YwKm7UpPzaM 99Z2m1CvJoIUZIwEeYVQv7Wizbr4Uzc8l7mUvG2t3+b8xrMS8x 5l0Ae3MT6yDwRDyZl6kaEcXpWbdxYyL8EJSRp5Zjd+OX6XfOVz 6ZqBB3swL8KfOjbnWlvyyVkuZD42A4Zf8nc9SYv0EgA2AmkF0v M9FiS01e95rK9XExlJJ5rx5uusyuluKw4rHEikWzGNXGSj7syh tXYQOkiEbyUj74R7gnx7tpmwJBm8SB4OnkbOox5eu X-Gm-Message-State: ALoCoQmEWD4Jaosn19VI6aDlNnVS9Y8bABP5aIf03TSS3qmFFtSGfb+CwdnsWEK10UnDpoi4rTKh 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. Without this patch, building collie_defconfig results in: drivers/pcmcia/pxa2xx_sharpsl.c:22:31: fatal error: mach-pxa/hardware.h: No such file or directory compilation terminated. make[3]: *** [drivers/pcmcia/pxa2xx_sharpsl.o] Error 1 make[2]: *** [drivers/pcmcia] Error 2 make[1]: *** [drivers] Error 2 make: *** [sub-make] Error 2 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,