[7/9,v4] ASoC: rsnd: remove slave_id settings for DMAEngine

Commit Message

Kuninori Morimoto Jan. 29, 2015, 1:03 a.m. UTC

From: Kuninori Morimoto <[e-mail]>

Current rsnd sets dma_slave_config :: slave_id field for DMAEngine,
but it is no longer needed. Let's remove it.

Signed-off-by: Kuninori Morimoto <[e-mail]>
Acked-by: Arnd Bergmann <[e-mail]>
---
v3 -> v4

 - no change

 sound/soc/sh/rcar/core.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Mark Brown Jan. 29, 2015, 11:32 a.m. UTC | #1

On Thu, Jan 29, 2015 at 01:03:20AM +0000, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <[e-mail]>
> 
> Current rsnd sets dma_slave_config :: slave_id field for DMAEngine,
> but it is no longer needed. Let's remove it.

Acked-by: Mark Brown <[e-mail]>

Geert Uytterhoeven Feb. 27, 2015, 9:40 a.m. UTC | #2

Hi Morimoto-san,

On Thu, Jan 29, 2015 at 2:03 AM, Kuninori Morimoto
<[e-mail]> wrote:
> From: Kuninori Morimoto <[e-mail]>
>
> Current rsnd sets dma_slave_config :: slave_id field for DMAEngine,
> but it is no longer needed. Let's remove it.
>
> Signed-off-by: Kuninori Morimoto <[e-mail]>
> Acked-by: Arnd Bergmann <[e-mail]>
> ---
> v3 -> v4
>
>  - no change

i noticed this patch was dropped in v5, and thus not applied by Vinod?
Did I miss a discussion about that?

https://patchwork.kernel.org/patch/5732671/

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [e-mail]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Kuninori Morimoto March 2, 2015, 12:03 a.m. UTC | #3

Hi Geert

> > From: Kuninori Morimoto <[e-mail]>
> >
> > Current rsnd sets dma_slave_config :: slave_id field for DMAEngine,
> > but it is no longer needed. Let's remove it.
> >
> > Signed-off-by: Kuninori Morimoto <[e-mail]>
> > Acked-by: Arnd Bergmann <[e-mail]>
> > ---
> > v3 -> v4
> >
> >  - no change
> 
> i noticed this patch was dropped in v5, and thus not applied by Vinod?
> Did I miss a discussion about that?
> 
> https://patchwork.kernel.org/patch/5732671/

Thank you for pointing it, and sorry I didn't explain about this patch.
Yes, I dropped this patch, because, Renesas sound card can't use
Audio DMA peri peri via DMAEngine anymore.
Sound card is now customized not to use DMAEngine.
Above change (= remove slave_id from sound driver) is done in sound driver
side customize patch-set.
Otherwise, we will have conflict between DMAEngine <-> Sound branch

Best regards
---
Kuninori Morimoto
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 75308bb..61473d9 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -316,7 +316,7 @@  int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma,
 		  int is_play, int id)
 {
 	struct device *dev = rsnd_priv_to_dev(priv);
-	struct dma_slave_config cfg;
+	struct dma_slave_config cfg = {};
 	struct rsnd_mod *mod_from;
 	struct rsnd_mod *mod_to;
 	char dma_name[DMA_NAME_SIZE];
@@ -334,7 +334,6 @@  int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma,
 	rsnd_dma_of_path(dma, is_play, &mod_from, &mod_to);
 	rsnd_dma_of_name(mod_from, mod_to, dma_name);
 
-	cfg.slave_id	= id;
 	cfg.direction	= is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
 	cfg.src_addr	= rsnd_gen_dma_addr(priv, mod_from, is_play, 1);
 	cfg.dst_addr	= rsnd_gen_dma_addr(priv, mod_to,   is_play, 0);