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

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

pcmcia: sa1111: pass sa1111_dev to jornada720 code 



All other sa1111 platforms pass sa1111_dev instance to platform-specific
code. Follow this approach for Jornada720 platform code.

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

drivers/pcmcia/sa1111_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static int pcmcia_probe(struct sa1111_dev *dev) 
	pcmcia_badge4_init(dev);

#endif

#ifdef CONFIG_SA1100_JORNADA720

	pcmcia_jornada720_init(&dev->dev);

	pcmcia_jornada720_init(dev);

#endif

#ifdef CONFIG_ARCH_LUBBOCK

	pcmcia_lubbock_init(dev);

drivers/pcmcia/sa1111_generic.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ extern void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *, struct pcmcia 
extern int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *, const socket_state_t *);



extern int pcmcia_badge4_init(struct sa1111_dev *);

extern int pcmcia_jornada720_init(struct device *);

extern int pcmcia_jornada720_init(struct sa1111_dev *);

extern int pcmcia_lubbock_init(struct sa1111_dev *);

extern int pcmcia_neponset_init(struct sa1111_dev *);

drivers/pcmcia/sa1111_jornada720.c

+1 −2
Original line number Diff line number Diff line
@@ -92,10 +92,9 @@ static struct pcmcia_low_level jornada720_pcmcia_ops = { 
	.nr			= 2,

};



int pcmcia_jornada720_init(struct device *dev)

int pcmcia_jornada720_init(struct sa1111_dev *sadev)

{

	int ret = -ENODEV;

	struct sa1111_dev *sadev = SA1111_DEV(dev);



	if (machine_is_jornada720()) {

		unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3;