From patchwork Sun Aug 7 11:05:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 1042352 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p77B61WO003110 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 7 Aug 2011 11:06:24 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qq1Ax-0005m1-Iw; Sun, 07 Aug 2011 11:05:47 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qq1Ax-0004OX-3C; Sun, 07 Aug 2011 11:05:47 +0000 Received: from mail-ey0-f171.google.com ([209.85.215.171]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qq1Au-0004OE-PA; Sun, 07 Aug 2011 11:05:45 +0000 Received: by eyg24 with SMTP id 24so4158916eyg.30 for ; Sun, 07 Aug 2011 04:05:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=l3+NAV/n5bzhyWKDyNKEV1Sp868aLYsSEDlx8RAxA9I=; b=Dev58J9hgZ8E/vbjAU2M9/WGACyv6ft3JgTxezjdCDzNrkrLLJYqR5cNQGh0XvfXPf +R75r0u6Ci0s5kN3s/x696BF7P9ey8gDTard65Iy91aIs27xIdCIfBiKs9ukU2kM7CrY UC17MSam8tyrnO5PHyRVxtoW/RQPf4GwIcj9Q= Received: by 10.213.27.15 with SMTP id g15mr1207320ebc.103.1312715138135; Sun, 07 Aug 2011 04:05:38 -0700 (PDT) Received: from localhost.localdomain ([194.85.238.22]) by mx.google.com with ESMTPS id t1sm1236910eeb.40.2011.08.07.04.05.36 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 07 Aug 2011 04:05:37 -0700 (PDT) From: Dmitry Eremin-Solenikov To: linux-arm-kernel@lists.infradead.org, linux-pcmcia@lists.infradead.org Subject: [PATCH] pcmcia/pxa2xx_sharpsl: retain ops structure on collie Date: Sun, 7 Aug 2011 15:05:31 +0400 Message-Id: <1312715131-3956-1-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.7.2.5 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110807_070545_050002_9A4ABFC7 X-CRM114-Status: UNSURE ( 8.55 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (dbaryshkov[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.171 listed in list.dnswl.org] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 T_TO_NO_BRKTS_FREEMAIL To: misformatted and free email service Cc: Dmitry Eremin-Solenikov , Eric Miao , stable@kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 07 Aug 2011 11:06:34 +0000 (UTC) The pxa2xx_sharpsl driver part is also used on collie, which (as a StrongARM board) has different expectations for PCMCIA drivers. So, on collie place sharpsl_pcmcia_ops in .data section rather than in __initdata. Signed-off-by: Dmitry Eremin-Solenikov Cc: stable@kernel.org diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c index 69ae2fd..f2405dc 100644 --- a/drivers/pcmcia/pxa2xx_sharpsl.c +++ b/drivers/pcmcia/pxa2xx_sharpsl.c @@ -219,7 +219,11 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) sharpsl_pcmcia_init_reset(skt); } +#ifdef CONFIG_SA1100_COLLIE +static struct pcmcia_low_level sharpsl_pcmcia_ops = { +#else static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = { +#endif .owner = THIS_MODULE, .hw_init = sharpsl_pcmcia_hw_init, .hw_shutdown = sharpsl_pcmcia_hw_shutdown,