summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-06-14 09:21:05 +0400
committerEric Miao <eric.y.miao@gmail.com>2011-07-11 14:43:32 +0800
commitb34e7b4f05730e6f26e9d8d3736271b0e4cdeac2 (patch)
tree5581cab74f275b12e465c086ce0c196f05d1e970
parent4c738b2568340f5a99618d75293d7ee6a9267b1b (diff)
downloadop-kernel-dev-b34e7b4f05730e6f26e9d8d3736271b0e4cdeac2.zip
op-kernel-dev-b34e7b4f05730e6f26e9d8d3736271b0e4cdeac2.tar.gz
ARM: scoop: drop pcmcia_init callback
A pcmcia_init callback isn't used on any of the platforms. Drop it. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
-rw-r--r--arch/arm/include/asm/hardware/scoop.h1
-rw-r--r--drivers/pcmcia/pxa2xx_sharpsl.c3
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 81af2b3..69ae2fd 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;
OpenPOWER on IntegriCloud