ASoC: rsnd: tidyup rsnd_dma_request_channel()

This patch adds "char *name" to rsnd_dma_request_channel().
It is not yet used so far, but is preparation for
next "ASoC: rsnd: adjust disabled module" patch

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/878s3vk01q.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c
index 44519929a28b24dad7892249d48579f5bbabe90d..d581f1424185a32797552340845cff0b43323a96 100644 (file)
--- a/sound/soc/sh/rcar/dma.c
+++ b/sound/soc/sh/rcar/dma.c
@@ -237,8 +237,8 @@ static int rsnd_dmaen_start(struct rsnd_mod *mod,
        return 0;
 }
 
-struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node,
-                                         struct rsnd_mod *mod, char *name)
+struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node, char *name,
+                                         struct rsnd_mod *mod, char *x)
 {
        struct dma_chan *chan = NULL;
        struct device_node *np;
@@ -246,7 +246,7 @@ struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node,
 
        for_each_child_of_node(of_node, np) {
                if (i == rsnd_mod_id_raw(mod) && (!chan))
-                       chan = of_dma_request_slave_channel(np, name);
+                       chan = of_dma_request_slave_channel(np, x);
                i++;
        }
 

diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index 1943ac1ff8035115175b8fd70baa950d470cab2e..5137e03a9d7c71f2000c093b518711aa77673d51 100644 (file)
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -282,7 +282,7 @@ static struct dma_chan *rsnd_dvc_dma_req(struct rsnd_dai_stream *io,
        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
 
        return rsnd_dma_request_channel(rsnd_dvc_of_node(priv),
-                                       mod, "tx");
+                                       DVC_NAME, mod, "tx");
 }
 
 #ifdef CONFIG_DEBUG_FS

diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 9269ab83967c6226abac2191833ff9e05c3a3218..256a11b67eed4fc76888c630516684a73fff42e4 100644 (file)
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -269,8 +269,8 @@ u32 rsnd_get_busif_shift(struct rsnd_dai_stream *io, struct rsnd_mod *mod);
 int rsnd_dma_attach(struct rsnd_dai_stream *io,
                    struct rsnd_mod *mod, struct rsnd_mod **dma_mod);
 int rsnd_dma_probe(struct rsnd_priv *priv);
-struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node,
-                                         struct rsnd_mod *mod, char *name);
+struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node, char *name,
+                                         struct rsnd_mod *mod, char *x);
 
 /*
  *     R-Car sound mod

diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 8f7af3e3a1cd95a7c66426a70edcae6ae32a9bb4..9ccc959c915011ebd31595871f5166fed5fe07b7 100644 (file)
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -82,7 +82,7 @@ static struct dma_chan *rsnd_src_dma_req(struct rsnd_dai_stream *io,
        int is_play = rsnd_io_is_play(io);
 
        return rsnd_dma_request_channel(rsnd_src_of_node(priv),
-                                       mod,
+                                       SRC_NAME, mod,
                                        is_play ? "rx" : "tx");
 }
 

diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index facdd8c0d419bc07c54a043d6c5084d98faa516c..c00e0d6bb7f4cd3d659880d792f24dde7f78f37f 100644 (file)
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -1019,7 +1019,7 @@ static struct dma_chan *rsnd_ssi_dma_req(struct rsnd_dai_stream *io,
                name = is_play ? "rx" : "tx";
 
        return rsnd_dma_request_channel(rsnd_ssi_of_node(priv),
-                                       mod, name);
+                                       SSI_NAME, mod, name);
 }
 
 #ifdef CONFIG_DEBUG_FS

diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c
index 4363508e8250df580939af5789327c631ceac110..c96995bb17cb151c454f995e9af2cae964923a75 100644 (file)
--- a/sound/soc/sh/rcar/ssiu.c
+++ b/sound/soc/sh/rcar/ssiu.c
@@ -395,7 +395,7 @@ static struct dma_chan *rsnd_ssiu_dma_req(struct rsnd_dai_stream *io,
        name = is_play ? "rx" : "tx";
 
        return rsnd_dma_request_channel(rsnd_ssiu_of_node(priv),
-                                       mod, name);
+                                       SSIU_NAME, mod, name);
 }
 
 #ifdef CONFIG_DEBUG_FS