redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Dmitry Eremin-Solenikov 2014-10-21 00:29:24 +04:00 committed by Greg Kroah-Hartman
parent cfd1f008c4
commit 4bc9ef297e
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pcmcia/sa1111_generic.c
View File

@ -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);

2
drivers/pcmcia/sa1111_generic.h
View File

@ -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 *);

3
drivers/pcmcia/sa1111_jornada720.c
View File

@ -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;