All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ASoC: fsi: fixup sparse errors
@ 2013-04-16  9:51 Kuninori Morimoto
       [not found] ` <87vc6825tw.wl%kuninori.morimoto.gx@renesas.com>
  0 siblings, 1 reply; 6+ messages in thread
From: Kuninori Morimoto @ 2013-04-16  9:51 UTC (permalink / raw)
  To: Mark Brown; +Cc: Linux-ALSA, Simon, Liam Girdwood, Kuninori Morimoto

This patch fixup below sparse errors

${LINUX}/sound/soc/sh/fsi.c:1459:9: \
	error: incompatible types in conditional expression (different base types)
${LINUX}/sound/soc/sh/fsi.c:1634:25: \
	error: incompatible types in conditional expression (different base types)
${LINUX}/sound/soc/sh/fsi.c:1639:17: \
	error: incompatible types in conditional expression (different base types)
${LINUX}/sound/soc/sh/fsi.c:2093:9: \
	error: incompatible types in conditional expression (different base types)
${LINUX}/sound/soc/sh/fsi.c:2105:9: \
	error: incompatible types in conditional expression (different base types)

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 sound/soc/sh/fsi.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index c724026a..7bc767b 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -276,7 +276,7 @@ struct fsi_stream_handler {
 	int (*probe)(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev);
 	int (*transfer)(struct fsi_priv *fsi, struct fsi_stream *io);
 	int (*remove)(struct fsi_priv *fsi, struct fsi_stream *io);
-	void (*start_stop)(struct fsi_priv *fsi, struct fsi_stream *io,
+	int (*start_stop)(struct fsi_priv *fsi, struct fsi_stream *io,
 			   int enable);
 };
 #define fsi_stream_handler_call(io, func, args...)	\
@@ -1189,7 +1189,7 @@ static int fsi_pio_push(struct fsi_priv *fsi, struct fsi_stream *io)
 				  samples);
 }
 
-static void fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
+static int fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
 			       int enable)
 {
 	struct fsi_master *master = fsi_get_master(fsi);
@@ -1202,6 +1202,8 @@ static void fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
 
 	if (fsi_is_clk_master(fsi))
 		fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0);
+
+	return 0;
 }
 
 static int fsi_pio_push_init(struct fsi_priv *fsi, struct fsi_stream *io)
@@ -1410,7 +1412,7 @@ static int fsi_dma_transfer(struct fsi_priv *fsi, struct fsi_stream *io)
 	return 0;
 }
 
-static void fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
+static int fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
 				 int start)
 {
 	struct fsi_master *master = fsi_get_master(fsi);
@@ -1423,6 +1425,8 @@ static void fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
 
 	if (fsi_is_clk_master(fsi))
 		fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0);
+
+	return 0;
 }
 
 static int fsi_dma_probe(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev)
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: fsi: fixup sparse errors
       [not found] ` <87vc6825tw.wl%kuninori.morimoto.gx@renesas.com>
@ 2013-05-27 11:30   ` Mark Brown
  2013-05-27 23:52     ` Simon Horman
  0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2013-05-27 11:30 UTC (permalink / raw)
  To: Kuninori Morimoto; +Cc: Linux-ALSA, Simon, Liam Girdwood, Kuninori Morimoto


[-- Attachment #1.1: Type: text/plain, Size: 134 bytes --]

On Fri, May 24, 2013 at 12:30:07AM -0700, Kuninori Morimoto wrote:
> 
> ping ?

Don't top post and don't send contentless pings.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]



^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: fsi: fixup sparse errors
  2013-05-27 11:30   ` Mark Brown
@ 2013-05-27 23:52     ` Simon Horman
  2013-05-28  7:55       ` [PATCH repost] " Kuninori Morimoto
  2013-05-28 10:02       ` [PATCH] " Mark Brown
  0 siblings, 2 replies; 6+ messages in thread
From: Simon Horman @ 2013-05-27 23:52 UTC (permalink / raw)
  To: Mark Brown
  Cc: Linux-ALSA, Liam Girdwood, Kuninori Morimoto, Kuninori Morimoto

On Mon, May 27, 2013 at 12:30:33PM +0100, Mark Brown wrote:
> On Fri, May 24, 2013 at 12:30:07AM -0700, Kuninori Morimoto wrote:
> > 
> > ping ?
> 
> Don't top post and don't send contentless pings.

Would it be acceptable for Morimoto-san to repost the patch instead?

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH repost] ASoC: fsi: fixup sparse errors
  2013-05-27 23:52     ` Simon Horman
@ 2013-05-28  7:55       ` Kuninori Morimoto
  2013-05-28 14:35         ` Mark Brown
  2013-05-28 10:02       ` [PATCH] " Mark Brown
  1 sibling, 1 reply; 6+ messages in thread
From: Kuninori Morimoto @ 2013-05-28  7:55 UTC (permalink / raw)
  To: Mark Brown; +Cc: Linux-ALSA, Simon Horman, Liam Girdwood, Kuninori Morimoto

This patch fixup below sparse errors

${LINUX}/sound/soc/sh/fsi.c:1459:9: \
	error: incompatible types in conditional expression (different base types)
${LINUX}/sound/soc/sh/fsi.c:1634:25: \
	error: incompatible types in conditional expression (different base types)
${LINUX}/sound/soc/sh/fsi.c:1639:17: \
	error: incompatible types in conditional expression (different base types)
${LINUX}/sound/soc/sh/fsi.c:2093:9: \
	error: incompatible types in conditional expression (different base types)
${LINUX}/sound/soc/sh/fsi.c:2105:9: \
	error: incompatible types in conditional expression (different base types)

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
This patch is based on mark/for-next branch

 sound/soc/sh/fsi.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index f830c41..3039026 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -276,7 +276,7 @@ struct fsi_stream_handler {
 	int (*probe)(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev);
 	int (*transfer)(struct fsi_priv *fsi, struct fsi_stream *io);
 	int (*remove)(struct fsi_priv *fsi, struct fsi_stream *io);
-	void (*start_stop)(struct fsi_priv *fsi, struct fsi_stream *io,
+	int (*start_stop)(struct fsi_priv *fsi, struct fsi_stream *io,
 			   int enable);
 };
 #define fsi_stream_handler_call(io, func, args...)	\
@@ -1188,7 +1188,7 @@ static int fsi_pio_push(struct fsi_priv *fsi, struct fsi_stream *io)
 				  samples);
 }
 
-static void fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
+static int fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
 			       int enable)
 {
 	struct fsi_master *master = fsi_get_master(fsi);
@@ -1201,6 +1201,8 @@ static void fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
 
 	if (fsi_is_clk_master(fsi))
 		fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0);
+
+	return 0;
 }
 
 static int fsi_pio_push_init(struct fsi_priv *fsi, struct fsi_stream *io)
@@ -1409,7 +1411,7 @@ static int fsi_dma_transfer(struct fsi_priv *fsi, struct fsi_stream *io)
 	return 0;
 }
 
-static void fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
+static int fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
 				 int start)
 {
 	struct fsi_master *master = fsi_get_master(fsi);
@@ -1422,6 +1424,8 @@ static void fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
 
 	if (fsi_is_clk_master(fsi))
 		fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0);
+
+	return 0;
 }
 
 static int fsi_dma_probe(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev)
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: fsi: fixup sparse errors
  2013-05-27 23:52     ` Simon Horman
  2013-05-28  7:55       ` [PATCH repost] " Kuninori Morimoto
@ 2013-05-28 10:02       ` Mark Brown
  1 sibling, 0 replies; 6+ messages in thread
From: Mark Brown @ 2013-05-28 10:02 UTC (permalink / raw)
  To: Simon Horman
  Cc: Linux-ALSA, Liam Girdwood, Kuninori Morimoto, Kuninori Morimoto


[-- Attachment #1.1: Type: text/plain, Size: 233 bytes --]

On Tue, May 28, 2013 at 08:52:33AM +0900, Simon Horman wrote:

> Would it be acceptable for Morimoto-san to repost the patch instead?

Yes, of course - that's actually something that can be used.
Contentless pings can't be acted on.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]



^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH repost] ASoC: fsi: fixup sparse errors
  2013-05-28  7:55       ` [PATCH repost] " Kuninori Morimoto
@ 2013-05-28 14:35         ` Mark Brown
  0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2013-05-28 14:35 UTC (permalink / raw)
  To: Kuninori Morimoto
  Cc: Linux-ALSA, Simon Horman, Liam Girdwood, Kuninori Morimoto


[-- Attachment #1.1: Type: text/plain, Size: 124 bytes --]

On Tue, May 28, 2013 at 12:55:12AM -0700, Kuninori Morimoto wrote:
> This patch fixup below sparse errors

Applied, thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]



^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-05-28 14:36 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-16  9:51 [PATCH] ASoC: fsi: fixup sparse errors Kuninori Morimoto
     [not found] ` <87vc6825tw.wl%kuninori.morimoto.gx@renesas.com>
2013-05-27 11:30   ` Mark Brown
2013-05-27 23:52     ` Simon Horman
2013-05-28  7:55       ` [PATCH repost] " Kuninori Morimoto
2013-05-28 14:35         ` Mark Brown
2013-05-28 10:02       ` [PATCH] " Mark Brown

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.