From patchwork Tue Jun 14 05:21:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 877772 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5E5LLXt004601 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 14 Jun 2011 05:21:42 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QWM3u-00089A-C7; Tue, 14 Jun 2011 05:21:14 +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 1QWM3t-0007jV-Up; Tue, 14 Jun 2011 05:21:13 +0000 Received: from mail-ey0-f177.google.com ([209.85.215.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QWM3q-0007jA-ML; Tue, 14 Jun 2011 05:21:11 +0000 Received: by eyh6 with SMTP id 6so2195178eyh.36 for ; Mon, 13 Jun 2011 22:21:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=b6rVNnIQ2K6zeua6FyYL2H3/d/dDJ7s0DruOPX0lwvQ=; b=d+1h3YAo047pN8vUc9ULEvPlAoWiELi56+KpQiY2kTPvtE2Zc90W6Bz21yz3zVTYFS 8xtMDZE9jfUg2UTAjtOXeEBizBP/NEJpgxoW8ZBjy0XdCnLFgIPeF6xw9ghz0cQeqSiK H+9suKWxLDMQmyYxCf62Byxnw6nBl38PfBk+4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=HvtE6KFRHy5fVBGOE+XjaBckOMpkq7hqRZlqc2BuYf1qSfZT+Gb0svbYNyTI5hubzR An0xzLsWkXjt9ZCfdjOu4KoE5pw7rkYE0TzPEnM9xbtk8jn/+R5UGpimiUU6QpPgFNgH rECSqa+40eLB+TN9TI6/P6yW2U1MnMoLUxgHM= Received: by 10.213.103.194 with SMTP id l2mr3019658ebo.37.1308028867513; Mon, 13 Jun 2011 22:21:07 -0700 (PDT) Received: from doriath.lumag.dynalias.net (92-100-239-77.dynamic.avangarddsl.ru [92.100.239.77]) by mx.google.com with ESMTPS id v76sm2707669eea.17.2011.06.13.22.21.04 (version=SSLv3 cipher=OTHER); Mon, 13 Jun 2011 22:21:06 -0700 (PDT) From: Dmitry Eremin-Solenikov To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] scoop: drop pcmcia_init callback Date: Tue, 14 Jun 2011 09:21:05 +0400 Message-Id: <1308028865-8460-1-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.7.5.3 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110614_012110_975465_D6D007F3 X-CRM114-Status: GOOD ( 11.31 ) 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 freemail (dbaryshkov[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.177 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 RFC_ABUSE_POST Both abuse and postmaster missing on sender domain 0.0 T_TO_NO_BRKTS_FREEMAIL T_TO_NO_BRKTS_FREEMAIL Cc: linux-pcmcia@lists.infradead.org, Eric Miao 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 (demeter2.kernel.org [140.211.167.43]); Tue, 14 Jun 2011 05:21:42 +0000 (UTC) A pcmcia_init callback isn't used on any of the platforms. Drop it. Signed-off-by: Dmitry Eremin-Solenikov --- arch/arm/include/asm/hardware/scoop.h | 1 - drivers/pcmcia/pxa2xx_sharpsl.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/asm/hardware/scoop.h b/arch/arm/include/asm/hardware/scoop.h index ebb3cea..58cdf5d 100644 --- a/arch/arm/include/asm/hardware/scoop.h +++ b/arch/arm/include/asm/hardware/scoop.h @@ -61,7 +61,6 @@ struct scoop_pcmcia_dev { struct scoop_pcmcia_config { struct scoop_pcmcia_dev *devs; int num_devs; - void (*pcmcia_init)(void); void (*power_ctrl)(struct device *scoop, unsigned short cpr, int nr); }; diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c index cece435..ca8cb322 100644 --- a/drivers/pcmcia/pxa2xx_sharpsl.c +++ b/drivers/pcmcia/pxa2xx_sharpsl.c @@ -48,9 +48,6 @@ static int sharpsl_pcmcia_hw_init(struct soc_pcmcia_socket *skt) { int ret; - if (platform_scoop_config->pcmcia_init) - platform_scoop_config->pcmcia_init(); - /* Register interrupts */ if (SCOOP_DEV[skt->nr].cd_irq >= 0) { struct pcmcia_irqs cd_irq;