[PATCH 0/2] pcmcia: small fixes for sa1111 machine code

linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed

* [PATCH 0/2] pcmcia: small fixes for sa1111 machine code
@ 2013-11-20 22:48 Dmitry Eremin-Solenikov
  2013-11-20 22:48 ` [PATCH 1/2] pcmcia: sa1111: pass sa1111_dev to badge4-specific code Dmitry Eremin-Solenikov
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Dmitry Eremin-Solenikov @ 2013-11-20 22:48 UTC (permalink / raw)
  To: linux-arm-kernel

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(-)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/2] pcmcia: sa1111: pass sa1111_dev to badge4-specific code
  2013-11-20 22:48 [PATCH 0/2] pcmcia: small fixes for sa1111 machine code Dmitry Eremin-Solenikov
@ 2013-11-20 22:48 ` Dmitry Eremin-Solenikov
  2013-11-20 22:48 ` [PATCH 2/2] pcmcia: sa1111: pass sa1111_dev to jornada720-specific code Dmitry Eremin-Solenikov
  2013-11-28 13:03 ` [PATCH 0/2] pcmcia: small fixes for sa1111 machine code Dmitry Eremin-Solenikov
  2 siblings, 0 replies; 5+ messages in thread
From: Dmitry Eremin-Solenikov @ 2013-11-20 22:48 UTC (permalink / raw)
  To: linux-arm-kernel

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>
---
 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(-)

diff --git a/drivers/pcmcia/sa1111_badge4.c b/drivers/pcmcia/sa1111_badge4.c
index 4d206f4..12f0dd0 100644
--- a/drivers/pcmcia/sa1111_badge4.c
+++ b/drivers/pcmcia/sa1111_badge4.c
@@ -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;
 
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index 65b02c3..a353186 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -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);
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 @@ 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 *);
-- 
1.8.4.2

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 2/2] pcmcia: sa1111: pass sa1111_dev to jornada720-specific code
  2013-11-20 22:48 [PATCH 0/2] pcmcia: small fixes for sa1111 machine code Dmitry Eremin-Solenikov
  2013-11-20 22:48 ` [PATCH 1/2] pcmcia: sa1111: pass sa1111_dev to badge4-specific code Dmitry Eremin-Solenikov
@ 2013-11-20 22:48 ` Dmitry Eremin-Solenikov
  2013-11-28 13:03 ` [PATCH 0/2] pcmcia: small fixes for sa1111 machine code Dmitry Eremin-Solenikov
  2 siblings, 0 replies; 5+ messages in thread
From: Dmitry Eremin-Solenikov @ 2013-11-20 22:48 UTC (permalink / raw)
  To: linux-arm-kernel

Pass 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 *'

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 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(-)

diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index a353186..53299f8 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)
 	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);
diff --git a/drivers/pcmcia/sa1111_generic.h b/drivers/pcmcia/sa1111_generic.h
index 86b9cc8..e74ecfd 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
 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 *);
 
diff --git a/drivers/pcmcia/sa1111_jornada720.c b/drivers/pcmcia/sa1111_jornada720.c
index 3baa3ef..ac60cd7 100644
--- a/drivers/pcmcia/sa1111_jornada720.c
+++ b/drivers/pcmcia/sa1111_jornada720.c
@@ -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;
 
-- 
1.8.4.2

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 0/2] pcmcia: small fixes for sa1111 machine code
  2013-11-20 22:48 [PATCH 0/2] pcmcia: small fixes for sa1111 machine code Dmitry Eremin-Solenikov
  2013-11-20 22:48 ` [PATCH 1/2] pcmcia: sa1111: pass sa1111_dev to badge4-specific code Dmitry Eremin-Solenikov
  2013-11-20 22:48 ` [PATCH 2/2] pcmcia: sa1111: pass sa1111_dev to jornada720-specific code Dmitry Eremin-Solenikov
@ 2013-11-28 13:03 ` Dmitry Eremin-Solenikov
  2013-12-10 22:32   ` Dmitry Eremin-Solenikov
  2 siblings, 1 reply; 5+ messages in thread
From: Dmitry Eremin-Solenikov @ 2013-11-28 13:03 UTC (permalink / raw)
  To: linux-arm-kernel

Hello,

On Thu, Nov 21, 2013 at 2:48 AM, Dmitry Eremin-Solenikov
<dbaryshkov@gmail.com> wrote:
> 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(-)

These changes do not cause any functional change, are rather trivial
and fix few compiler warnings.
Can we get them in?

-- 
With best wishes
Dmitry

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 0/2] pcmcia: small fixes for sa1111 machine code
  2013-11-28 13:03 ` [PATCH 0/2] pcmcia: small fixes for sa1111 machine code Dmitry Eremin-Solenikov
@ 2013-12-10 22:32   ` Dmitry Eremin-Solenikov
  0 siblings, 0 replies; 5+ messages in thread
From: Dmitry Eremin-Solenikov @ 2013-12-10 22:32 UTC (permalink / raw)
  To: linux-arm-kernel

Hello again,

On Thu, Nov 28, 2013 at 5:03 PM, Dmitry Eremin-Solenikov
<dbaryshkov@gmail.com> wrote:
> Hello,
>
> On Thu, Nov 21, 2013 at 2:48 AM, Dmitry Eremin-Solenikov
> <dbaryshkov@gmail.com> wrote:
>> 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(-)
>
> 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?)

-- 
With best wishes
Dmitry

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2013-12-10 22:32 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-20 22:48 [PATCH 0/2] pcmcia: small fixes for sa1111 machine code Dmitry Eremin-Solenikov
2013-11-20 22:48 ` [PATCH 1/2] pcmcia: sa1111: pass sa1111_dev to badge4-specific code Dmitry Eremin-Solenikov
2013-11-20 22:48 ` [PATCH 2/2] pcmcia: sa1111: pass sa1111_dev to jornada720-specific code Dmitry Eremin-Solenikov
2013-11-28 13:03 ` [PATCH 0/2] pcmcia: small fixes for sa1111 machine code Dmitry Eremin-Solenikov
2013-12-10 22:32   ` Dmitry Eremin-Solenikov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).