* [PATCH] scoop: drop pcmcia_init callback
@ 2011-06-14 5:21 Dmitry Eremin-Solenikov
2011-06-14 9:57 ` Eric Miao
0 siblings, 1 reply; 2+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-06-14 5:21 UTC (permalink / raw)
To: linux-arm-kernel
A pcmcia_init callback isn't used on any of the platforms. Drop it.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
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;
--
1.7.5.3
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] scoop: drop pcmcia_init callback
2011-06-14 5:21 [PATCH] scoop: drop pcmcia_init callback Dmitry Eremin-Solenikov
@ 2011-06-14 9:57 ` Eric Miao
0 siblings, 0 replies; 2+ messages in thread
From: Eric Miao @ 2011-06-14 9:57 UTC (permalink / raw)
To: linux-arm-kernel
Applied.
On Tue, Jun 14, 2011 at 1:21 PM, Dmitry Eremin-Solenikov
<dbaryshkov@gmail.com> wrote:
> A pcmcia_init callback isn't used on any of the platforms. Drop it.
>
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> ---
> ?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;
> --
> 1.7.5.3
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-14 9:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-14 5:21 [PATCH] scoop: drop pcmcia_init callback Dmitry Eremin-Solenikov
2011-06-14 9:57 ` Eric Miao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).