ASoC: simple-card-utils: share asoc_simple_dai_init()

The difference between simple-card / audio-graph are just using
OF graph style, or not. In other words, other things should be same.
This means, simple-card/audio-graph common functions should be
implemented at simple-card-utils, and its own functions should be
implemented at each files.

Current simple-card / audio-graph have almost same functions.
This patch shares asoc_simple_dai_init() between in these 2 drivers.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index 89ae0841b7115afefb30a42f11aac2c9dc7aed07..204343789ae70145b0ac664fd25e6716dfa268a5 100644 (file)
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -88,6 +88,7 @@ int asoc_simple_startup(struct snd_pcm_substream *substream);
 void asoc_simple_shutdown(struct snd_pcm_substream *substream);
 int asoc_simple_hw_params(struct snd_pcm_substream *substream,
                          struct snd_pcm_hw_params *params);
+int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd);
 
 #define asoc_simple_card_parse_cpu(node, dai_link,                             \
                                   list_name, cells_name, is_single_link)       \
@@ -130,9 +131,6 @@ int asoc_simple_card_parse_graph_dai(struct device_node *ep,
                                        &(dai)->slots,          \
                                        &(dai)->slot_width);
 
-int asoc_simple_card_init_dai(struct snd_soc_dai *dai,
-                             struct asoc_simple_dai *simple_dai);
-
 void asoc_simple_card_canonicalize_platform(struct snd_soc_dai_link *dai_link);
 void asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
                                      int is_single_links);

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 51160adaf5bb4435a73e6c934b115527936690a7..b1ceefc608798b708678afa41a305ada110aae73 100644 (file)
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -62,25 +62,6 @@ static const struct snd_soc_ops graph_ops = {
        .hw_params      = asoc_simple_hw_params,
 };
 
-static int graph_dai_init(struct snd_soc_pcm_runtime *rtd)
-{
-       struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);
-       struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);
-       int ret = 0;
-
-       ret = asoc_simple_card_init_dai(rtd->codec_dai,
-                                       dai_props->codec_dai);
-       if (ret < 0)
-               return ret;
-
-       ret = asoc_simple_card_init_dai(rtd->cpu_dai,
-                                       dai_props->cpu_dai);
-       if (ret < 0)
-               return ret;
-
-       return 0;
-}
-
 static int graph_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
                                    struct snd_pcm_hw_params *params)
 {
@@ -255,7 +236,7 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
        dai_link->dpcm_playback         = 1;
        dai_link->dpcm_capture          = 1;
        dai_link->ops                   = &graph_ops;
-       dai_link->init                  = graph_dai_init;
+       dai_link->init                  = asoc_simple_dai_init;
 
        return 0;
 }
@@ -327,7 +308,7 @@ static int graph_dai_link_of(struct asoc_simple_priv *priv,
                return ret;
 
        dai_link->ops = &graph_ops;
-       dai_link->init = graph_dai_init;
+       dai_link->init = asoc_simple_dai_init;
 
        asoc_simple_card_canonicalize_platform(dai_link);
        asoc_simple_card_canonicalize_cpu(dai_link,

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index de23cf8bffbd2d52e6274ab239909385740a1c7c..c9b53b340028ed36877cce37134efbc9ae986109 100644 (file)
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -436,8 +436,8 @@ int asoc_simple_card_parse_graph_dai(struct device_node *ep,
 }
 EXPORT_SYMBOL_GPL(asoc_simple_card_parse_graph_dai);
 
-int asoc_simple_card_init_dai(struct snd_soc_dai *dai,
-                             struct asoc_simple_dai *simple_dai)
+static int asoc_simple_card_init_dai(struct snd_soc_dai *dai,
+                                    struct asoc_simple_dai *simple_dai)
 {
        int ret;
 
@@ -467,7 +467,26 @@ int asoc_simple_card_init_dai(struct snd_soc_dai *dai,
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(asoc_simple_card_init_dai);
+
+int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd)
+{
+       struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);
+       struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);
+       int ret;
+
+       ret = asoc_simple_card_init_dai(rtd->codec_dai,
+                                       dai_props->codec_dai);
+       if (ret < 0)
+               return ret;
+
+       ret = asoc_simple_card_init_dai(rtd->cpu_dai,
+                                       dai_props->cpu_dai);
+       if (ret < 0)
+               return ret;
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(asoc_simple_dai_init);
 
 void asoc_simple_card_canonicalize_platform(struct snd_soc_dai_link *dai_link)
 {

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 7e836473eb118e21da7f8388b10640885dd19921..bf4482ecfe3e0cccb128d0bb0a74f61aa8b62e45 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -32,25 +32,6 @@ static const struct snd_soc_ops simple_ops = {
        .hw_params      = asoc_simple_hw_params,
 };
 
-static int simple_dai_init(struct snd_soc_pcm_runtime *rtd)
-{
-       struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);
-       struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);
-       int ret;
-
-       ret = asoc_simple_card_init_dai(rtd->codec_dai,
-                                       dai_props->codec_dai);
-       if (ret < 0)
-               return ret;
-
-       ret = asoc_simple_card_init_dai(rtd->cpu_dai,
-                                       dai_props->cpu_dai);
-       if (ret < 0)
-               return ret;
-
-       return 0;
-}
-
 static int simple_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
                                     struct snd_pcm_hw_params *params)
 {
@@ -221,7 +202,7 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
        dai_link->dpcm_playback         = 1;
        dai_link->dpcm_capture          = 1;
        dai_link->ops                   = &simple_ops;
-       dai_link->init                  = simple_dai_init;
+       dai_link->init                  = asoc_simple_dai_init;
 
        return 0;
 }
@@ -316,7 +297,7 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv,
                goto dai_link_of_err;
 
        dai_link->ops = &simple_ops;
-       dai_link->init = simple_dai_init;
+       dai_link->init = asoc_simple_dai_init;
 
        asoc_simple_card_canonicalize_cpu(dai_link, single_cpu);
        asoc_simple_card_canonicalize_platform(dai_link);
@@ -694,7 +675,7 @@ static int simple_probe(struct platform_device *pdev)
                dai_link->stream_name   = cinfo->name;
                dai_link->cpu_dai_name  = cinfo->cpu_dai.name;
                dai_link->dai_fmt       = cinfo->daifmt;
-               dai_link->init          = simple_dai_init;
+               dai_link->init          = asoc_simple_dai_init;
                memcpy(priv->dai_props->cpu_dai, &cinfo->cpu_dai,
                                        sizeof(*priv->dai_props->cpu_dai));
                memcpy(priv->dai_props->codec_dai, &cinfo->codec_dai,