commit cfd1f008c4ee7ba4567f8488fb2dc740bd787151
author Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Tue Oct 21 00:29:23 2014 +0400
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> Fri Nov 07 11:24:01 2014 -0800
tree 4c074795ca5eedfc137b78471b94bbcce85755ce
parent d0439a5442cf43434d87faf34f4d2c19d3aba88a

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: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/pcmcia/sa1111_generic.h

diff --git a/drivers/pcmcia/sa1111_generic.h b/drivers/pcmcia/sa1111_generic.h
index f6376e3..86b9cc8 100644
--- a/drivers/pcmcia/sa1111_generic.h
+++ b/drivers/pcmcia/sa1111_generic.h
@@ -18,7 +18,7 @@
 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 *);