ASoC: rsnd: rename rsnd_dma_init() to rsnd_dma_attach()

Renesas sound needs many devices
(SSI/SSIU/SRC/CTU/MIX/DVC/CMD/AudioDMAC/AudioDMACpp).
SSI/SRC/CTU/MIX/DVC are implemented as module.
SSI parent, SSIU are implemented as part of SSI
CMD is implemented as part of CTU/MIX/DVC
AudioDMAC/AudioDMACpp are implemented as part of SSI/SRC
It is nice sense that these all devices are implemented as mod.

DMA will be implemented as module. Then each rsnd_dma_ops will be
rsnd_mod_ops. But current rsnd_dma_ops::init means "DMA attach".
This patch removes .init from rsnd_dma_ops, and renames
rsnd_dma_init() to rsnd_dma_attach()

Signed-off-by: Kuninori Morimoto <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 00e83e0670e75a2f08cf28a0bfa5da63174110ec..705e524b0892e86a6b887d8a255f7808f6e62c33 100644 (file)
--- a/sound/soc/sh/rcar/dma.c
+++ b/sound/soc/sh/rcar/dma.c
@@ -52,8 +52,6 @@ struct rsnd_dma_ops {
        char *name;
        void (*start)(struct rsnd_dai_stream *io, struct rsnd_dma *dma);
        void (*stop)(struct rsnd_dai_stream *io, struct rsnd_dma *dma);
-       int (*init)(struct rsnd_dai_stream *io, struct rsnd_dma *dma, int id,
-                   struct rsnd_mod *mod_from, struct rsnd_mod *mod_to);
        void (*quit)(struct rsnd_dai_stream *io, struct rsnd_dma *dma);
 };
 
@@ -176,7 +174,7 @@ static struct dma_chan *rsnd_dmaen_request_channel(struct rsnd_dai_stream *io,
                return rsnd_mod_dma_req(io, mod_to);
 }
 
-static int rsnd_dmaen_init(struct rsnd_dai_stream *io,
+static int rsnd_dmaen_attach(struct rsnd_dai_stream *io,
                           struct rsnd_dma *dma, int id,
                           struct rsnd_mod *mod_from, struct rsnd_mod *mod_to)
 {
@@ -221,11 +219,11 @@ static int rsnd_dmaen_init(struct rsnd_dai_stream *io,
 
        ret = dmaengine_slave_config(dmaen->chan, &cfg);
        if (ret < 0)
-               goto rsnd_dma_init_err;
+               goto rsnd_dma_attach_err;
 
        return 0;
 
-rsnd_dma_init_err:
+rsnd_dma_attach_err:
        rsnd_dma_quit(io, dma);
 rsnd_dma_channel_err:
 
@@ -252,7 +250,6 @@ static struct rsnd_dma_ops rsnd_dmaen_ops = {
        .name   = "audmac",
        .start  = rsnd_dmaen_start,
        .stop   = rsnd_dmaen_stop,
-       .init   = rsnd_dmaen_init,
        .quit   = rsnd_dmaen_quit,
 };
 
@@ -372,9 +369,9 @@ static void rsnd_dmapp_start(struct rsnd_dai_stream *io, struct rsnd_dma *dma)
        rsnd_dmapp_write(dma, dmapp->chcr,      PDMACHCR);
 }
 
-static int rsnd_dmapp_init(struct rsnd_dai_stream *io,
-                          struct rsnd_dma *dma, int id,
-                          struct rsnd_mod *mod_from, struct rsnd_mod *mod_to)
+static int rsnd_dmapp_attach(struct rsnd_dai_stream *io,
+                            struct rsnd_dma *dma, int id,
+                            struct rsnd_mod *mod_from, struct rsnd_mod *mod_to)
 {
        struct rsnd_dmapp *dmapp = rsnd_dma_to_dmapp(dma);
        struct rsnd_priv *priv = rsnd_io_to_priv(io);
@@ -398,7 +395,6 @@ static struct rsnd_dma_ops rsnd_dmapp_ops = {
        .name   = "audmac-pp",
        .start  = rsnd_dmapp_start,
        .stop   = rsnd_dmapp_stop,
-       .init   = rsnd_dmapp_init,
        .quit   = rsnd_dmapp_stop,
 };
 
@@ -630,8 +626,8 @@ void rsnd_dma_quit(struct rsnd_dai_stream *io, struct rsnd_dma *dma)
        dma->ops->quit(io, dma);
 }
 
-struct rsnd_dma *rsnd_dma_init(struct rsnd_dai_stream *io,
-                              struct rsnd_mod *mod, int id)
+struct rsnd_dma *rsnd_dma_attach(struct rsnd_dai_stream *io,
+                                struct rsnd_mod *mod, int id)
 {
        struct rsnd_mod *mod_from = NULL;
        struct rsnd_mod *mod_to = NULL;
@@ -639,6 +635,8 @@ struct rsnd_dma *rsnd_dma_init(struct rsnd_dai_stream *io,
        struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv);
        struct rsnd_dma *dma;
        struct device *dev = rsnd_priv_to_dev(priv);
+       int (*attach)(struct rsnd_dai_stream *io, struct rsnd_dma *dma, int id,
+                     struct rsnd_mod *mod_from, struct rsnd_mod *mod_to);
        int is_play = rsnd_io_is_play(io);
        int ret;
 
@@ -663,21 +661,26 @@ struct rsnd_dma *rsnd_dma_init(struct rsnd_dai_stream *io,
        dma->dst_addr = rsnd_dma_addr(io, mod_to,   is_play, 0);
 
        /* for Gen2 */
-       if (mod_from && mod_to)
+       if (mod_from && mod_to) {
                dma->ops = &rsnd_dmapp_ops;
-       else
+               attach  = rsnd_dmapp_attach;
+       } else {
                dma->ops = &rsnd_dmaen_ops;
+               attach  = rsnd_dmaen_attach;
+       }
 
        /* for Gen1, overwrite */
-       if (rsnd_is_gen1(priv))
+       if (rsnd_is_gen1(priv)) {
                dma->ops = &rsnd_dmaen_ops;
+               attach  = rsnd_dmaen_attach;
+       }
 
        dev_dbg(dev, "%s %s[%d] -> %s[%d]\n",
                dma->ops->name,
                rsnd_mod_name(mod_from), rsnd_mod_id(mod_from),
                rsnd_mod_name(mod_to),   rsnd_mod_id(mod_to));
 
-       ret = dma->ops->init(io, dma, id, mod_from, mod_to);
+       ret = attach(io, dma, id, mod_from, mod_to);
        if (ret < 0)
                return ERR_PTR(ret);
 

diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 1dc05a24c01c0b552bb9cad132cf5e9046a4750c..dc31f6d84ee4ad36781899376420ec79f65cf8cf 100644 (file)
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -197,7 +197,7 @@ struct rsnd_dma;
 
 void rsnd_dma_start(struct rsnd_dai_stream *io, struct rsnd_dma *dma);
 void rsnd_dma_stop(struct rsnd_dai_stream *io, struct rsnd_dma *dma);
-struct rsnd_dma *rsnd_dma_init(struct rsnd_dai_stream *io,
+struct rsnd_dma *rsnd_dma_attach(struct rsnd_dai_stream *io,
                               struct rsnd_mod *mod, int id);
 void rsnd_dma_quit(struct rsnd_dai_stream *io, struct rsnd_dma *dma);
 int rsnd_dma_probe(struct platform_device *pdev,

diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 3296f1e96d3065e5f151cb323788339f6d5c397b..abfcc2480cf63c1558b1a731dd74ecf6f44d29e2 100644 (file)
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -841,7 +841,7 @@ static int rsnd_src_probe_gen2(struct rsnd_mod *mod,
                        return ret;
        }
 
-       src->dma = rsnd_dma_init(io, mod, src->info->dma_id);
+       src->dma = rsnd_dma_attach(io, mod, src->info->dma_id);
        if (IS_ERR(src->dma))
                return PTR_ERR(src->dma);
 

diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index eec17bcc89faf26fc5e82ddf6f75819310882d43..d4803a82497d0a307091cd75aee495c572f61833 100644 (file)
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -539,7 +539,7 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
        if (ret)
                return ret;
 
-       ssi->dma = rsnd_dma_init(io, mod, dma_id);
+       ssi->dma = rsnd_dma_attach(io, mod, dma_id);
        if (IS_ERR(ssi->dma))
                return PTR_ERR(ssi->dma);