aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2014-10-20 16:29:24 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-07 14:24:01 -0500
commit4bc9ef297e3e85deeae81d1156fac89012c7db9a (patch)
tree429c30bba5dee000f2fae217fc5b94d8b1564524
parentcfd1f008c4ee7ba4567f8488fb2dc740bd787151 (diff)
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>
-rw-r--r--drivers/pcmcia/sa1111_generic.c2
-rw-r--r--drivers/pcmcia/sa1111_generic.h2
-rw-r--r--drivers/pcmcia/sa1111_jornada720.c3
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index a353186509cf..53299f866c5d 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -200,7 +200,7 @@ static int pcmcia_probe(struct sa1111_dev *dev)
200 pcmcia_badge4_init(dev); 200 pcmcia_badge4_init(dev);
201#endif 201#endif
202#ifdef CONFIG_SA1100_JORNADA720 202#ifdef CONFIG_SA1100_JORNADA720
203 pcmcia_jornada720_init(&dev->dev); 203 pcmcia_jornada720_init(dev);
204#endif 204#endif
205#ifdef CONFIG_ARCH_LUBBOCK 205#ifdef CONFIG_ARCH_LUBBOCK
206 pcmcia_lubbock_init(dev); 206 pcmcia_lubbock_init(dev);
diff --git a/drivers/pcmcia/sa1111_generic.h b/drivers/pcmcia/sa1111_generic.h
index 86b9cc883420..e74ecfdc1b26 100644
--- a/drivers/pcmcia/sa1111_generic.h
+++ b/drivers/pcmcia/sa1111_generic.h
@@ -19,7 +19,7 @@ extern void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *, struct pcmcia
19extern int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *, const socket_state_t *); 19extern int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *, const socket_state_t *);
20 20
21extern int pcmcia_badge4_init(struct sa1111_dev *); 21extern int pcmcia_badge4_init(struct sa1111_dev *);
22extern int pcmcia_jornada720_init(struct device *); 22extern int pcmcia_jornada720_init(struct sa1111_dev *);
23extern int pcmcia_lubbock_init(struct sa1111_dev *); 23extern int pcmcia_lubbock_init(struct sa1111_dev *);
24extern int pcmcia_neponset_init(struct sa1111_dev *); 24extern int pcmcia_neponset_init(struct sa1111_dev *);
25 25
diff --git a/drivers/pcmcia/sa1111_jornada720.c b/drivers/pcmcia/sa1111_jornada720.c
index 40e040314503..c2c30580c83f 100644
--- a/drivers/pcmcia/sa1111_jornada720.c
+++ b/drivers/pcmcia/sa1111_jornada720.c
@@ -92,10 +92,9 @@ static struct pcmcia_low_level jornada720_pcmcia_ops = {
92 .nr = 2, 92 .nr = 2,
93}; 93};
94 94
95int pcmcia_jornada720_init(struct device *dev) 95int pcmcia_jornada720_init(struct sa1111_dev *sadev)
96{ 96{
97 int ret = -ENODEV; 97 int ret = -ENODEV;
98 struct sa1111_dev *sadev = SA1111_DEV(dev);
99 98
100 if (machine_is_jornada720()) { 99 if (machine_is_jornada720()) {
101 unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3; 100 unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3;