aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-06-14 01:21:05 -0400
committerEric Miao <eric.y.miao@gmail.com>2011-07-11 02:43:32 -0400
commitb34e7b4f05730e6f26e9d8d3736271b0e4cdeac2 (patch)
tree5581cab74f275b12e465c086ce0c196f05d1e970
parent4c738b2568340f5a99618d75293d7ee6a9267b1b (diff)
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 ebb3ceaa8fac..58cdf5d84122 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 {
61struct scoop_pcmcia_config { 61struct scoop_pcmcia_config {
62 struct scoop_pcmcia_dev *devs; 62 struct scoop_pcmcia_dev *devs;
63 int num_devs; 63 int num_devs;
64 void (*pcmcia_init)(void);
65 void (*power_ctrl)(struct device *scoop, unsigned short cpr, int nr); 64 void (*power_ctrl)(struct device *scoop, unsigned short cpr, int nr);
66}; 65};
67 66
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c
index 81af2b3bcc00..69ae2fd22400 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)
48{ 48{
49 int ret; 49 int ret;
50 50
51 if (platform_scoop_config->pcmcia_init)
52 platform_scoop_config->pcmcia_init();
53
54 /* Register interrupts */ 51 /* Register interrupts */
55 if (SCOOP_DEV[skt->nr].cd_irq >= 0) { 52 if (SCOOP_DEV[skt->nr].cd_irq >= 0) {
56 struct pcmcia_irqs cd_irq; 53 struct pcmcia_irqs cd_irq;