pcmcia: small fixes for sa1111 machine code
cover pcmcia: small fixes for sa1111 machine code
The following changes since commit dec8e46178bad9f1717a948572d76e0f804be801:
Merge tag 'arc-v3.13-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc (2013-11-19 11:44:15 -0800)
are available in the git repository at:
git://github.com/lumag/linux sa1111-pcmcia
for you to fetch changes up to d968c6bc2fad65739e546e4adf6b72ec1f4748e7:
pcmcia: sa1111: pass sa1111_dev to jornada720-specific code (2013-11-21 01:27:24 +0400)
----------------------------------------------------------------
Dmitry Eremin-Solenikov (2):
pcmcia: sa1111: pass sa1111_dev to badge4-specific code
pcmcia: sa1111: pass sa1111_dev to jornada720-specific code
drivers/pcmcia/sa1111_badge4.c | 2 +- drivers/pcmcia/sa1111_generic.c | 4 ++-- drivers/pcmcia/sa1111_generic.h | 4 ++-- drivers/pcmcia/sa1111_jornada720.c | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-)
PATCH 1/2 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 *'
--- drivers/pcmcia/sa1111_badge4.c | 2 +- drivers/pcmcia/sa1111_generic.c | 2 +- drivers/pcmcia/sa1111_generic.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/pcmcia/sa1111_badge4.c +1 -1
@@ -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
@@ -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
@@ -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 *);
Signature · 1 line
1.8.4.2
PATCH 2/2 pcmcia: sa1111: pass sa1111_dev to jornada720-specific code
In reply to Dmitry Eremin-SolenikovPass sa1111_dev to platform-specific init code, as it is done by lubbock and neponset. This removes a compilation warnings:
drivers/pcmcia/sa1111_jornada720.c: In function 'pcmcia_jornada720_init':drivers/pcmcia/sa1111_jornada720.c:105:3: warning: passing argument 1 of 'sa1111_set_io_dir' from incompatible pointer type [enabled by default] In file included from drivers/pcmcia/sa1111_jornada720.c:15:0:arch/arm/include/asm/hardware/sa1111.h:463:6: note: expected 'struct sa1111_dev *' but argument is of type 'struct device *' drivers/pcmcia/sa1111_jornada720.c:106:3: warning: passing argument 1 of 'sa1111_set_io' from incompatible pointer type [enabled by default] In file included from drivers/pcmcia/sa1111_jornada720.c:15:0:arch/arm/include/asm/hardware/sa1111.h:464:6: note: expected 'struct sa1111_dev *' but argument is of type 'struct device *' drivers/pcmcia/sa1111_jornada720.c:107:3: warning: passing argument 1 of 'sa1111_set_sleep_io' from incompatible pointer type [enabled by default] In file included from drivers/pcmcia/sa1111_jornada720.c:15:0:arch/arm/include/asm/hardware/sa1111.h:465:6: note: expected 'struct sa1111_dev *' but argument is of type 'struct device *' drivers/pcmcia/sa1111_jornada720.c:111:5: warning: passing argument 1 of 'sa1111_pcmcia_add' from incompatible pointer type [enabled by default] In file included from drivers/pcmcia/sa1111_jornada720.c:18:0:drivers/pcmcia/sa1111_generic.h:15:5: note: expected 'struct sa1111_dev *' but argument is of type 'struct device *'
--- drivers/pcmcia/sa1111_generic.c | 2 +- drivers/pcmcia/sa1111_generic.h | 2 +- drivers/pcmcia/sa1111_jornada720.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-)
drivers/pcmcia/sa1111_generic.c +1 -1
@@ -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
@@ -19,7 +19,7 @@ extern void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *, struct pcmciaextern 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 +2 -1
@@ -9,6 +9,7 @@#include <linux/device.h> #include <linux/errno.h> #include <linux/init.h> +#include <linux/io.h> #include <mach/hardware.h> #include <asm/hardware/sa1111.h>
@@ -91,7 +92,7 @@ static struct pcmcia_low_level jornada720_pcmcia_ops = { .nr = 2, }; -int pcmcia_jornada720_init (struct device *dev) +int pcmcia_jornada720_init (struct sa1111_dev *dev) {int ret = -ENODEV ;
Signature · 1 line
1.8.4.2
cover pcmcia: small fixes for sa1111 machine code
In reply to Dmitry Eremin-SolenikovHello,
Quoted 9 lines · Dmitry Eremin-Solenikov
Dmitry Eremin-Solenikov (2):
pcmcia: sa1111: passsa1111_devto badge4-specific code
pcmcia: sa1111: passsa1111_devto jornada720-specific codedrivers/pcmcia/sa1111_badge4.c | 2 +- drivers/pcmcia/sa1111_generic.c | 4 ++-- drivers/pcmcia/sa1111_generic.h | 4 ++-- drivers/pcmcia/sa1111_jornada720.c | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-)
These changes do not cause any functional change, are rather trivial and fix few compiler warnings.
Can we get them in?
Signature · 2 lines
With best wishes Dmitry
cover pcmcia: small fixes for sa1111 machine code
Hello again,
Quoted 14 lines · Dmitry Eremin-Solenikov
Hello,
Quoted 9 lines · Dmitry Eremin-Solenikov
Dmitry Eremin-Solenikov (2):
pcmcia: sa1111: passsa1111_devto badge4-specific code
pcmcia: sa1111: passsa1111_devto jornada720-specific codedrivers/pcmcia/sa1111_badge4.c | 2 +- drivers/pcmcia/sa1111_generic.c | 4 ++-- drivers/pcmcia/sa1111_generic.h | 4 ++-- drivers/pcmcia/sa1111_jornada720.c | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-)
Quoted 3 lines
These changes do not cause any functional change, are rather trivial and fix few compiler warnings.
Can we get them in?
Re-ping. These two patches are trivial, provide no functional changes, fix few warnings.
Russell, would it be OK to merge them through your tree/patch-tracker? Should they be merged through some other tree (if so, can you please bless them?)
Signature · 2 lines
With best wishes Dmitry