Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfd1f008 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Greg Kroah-Hartman
Browse files

pcmcia: sa1111: pass sa1111_dev to badge4-specific code 



Pass sa1111_dev to platform-specific init code, as it is done by lubbock
and neponset. This removes a compilation warnings:

drivers/pcmcia/sa1111_badge4.c: In function 'pcmcia_badge4_init':
drivers/pcmcia/sa1111_badge4.c:147:5: warning: passing argument 1 of 'sa1111_pcmcia_add' from incompatible pointer type [enabled by default]
In file included from drivers/pcmcia/sa1111_badge4.c:26:0:
drivers/pcmcia/sa1111_generic.h:15:5: note: expected 'struct sa1111_dev *' but argument is of type 'struct device *'

Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d0439a54

drivers/pcmcia/sa1111_badge4.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static struct pcmcia_low_level badge4_pcmcia_ops = { 
	.nr			= 2,

};



int pcmcia_badge4_init(struct device *dev)

int pcmcia_badge4_init(struct sa1111_dev *dev)

{

	int ret = -ENODEV;

drivers/pcmcia/sa1111_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int pcmcia_probe(struct sa1111_dev *dev) 
	sa1111_writel(PCCR_S0_FLT | PCCR_S1_FLT, base + PCCR);



#ifdef CONFIG_SA1100_BADGE4

	pcmcia_badge4_init(&dev->dev);

	pcmcia_badge4_init(dev);

#endif

#ifdef CONFIG_SA1100_JORNADA720

	pcmcia_jornada720_init(&dev->dev);

drivers/pcmcia/sa1111_generic.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops, 
extern void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *, struct pcmcia_state *);

extern int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *, const socket_state_t *);



extern int pcmcia_badge4_init(struct device *);

extern int pcmcia_badge4_init(struct sa1111_dev *);

extern int pcmcia_jornada720_init(struct device *);

extern int pcmcia_lubbock_init(struct sa1111_dev *);

extern int pcmcia_neponset_init(struct sa1111_dev *);