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

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_startup() 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 c0161ec17572324ca401d61f839a7ae62bf8174a..0653fb9385d1056bc1e633caa41af7ab7db8d93e 100644 (file)
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -84,8 +84,8 @@ int asoc_simple_card_parse_clk(struct device *dev,
                               struct asoc_simple_dai *simple_dai,
                               const char *dai_name,
                               struct snd_soc_dai_link_component *dlc);
-int asoc_simple_card_clk_enable(struct asoc_simple_dai *dai);
 void asoc_simple_card_clk_disable(struct asoc_simple_dai *dai);
+int asoc_simple_startup(struct snd_pcm_substream *substream);
 
 #define asoc_simple_card_parse_cpu(node, dai_link,                             \
                                   list_name, cells_name, is_single_link)       \

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 656ca49ba72797d27dd16f46d36e1af6b80a203b..29ae71b427ecc752e278fbdee2ec21024d241f4b 100644 (file)
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -56,24 +56,6 @@ static const struct snd_soc_dapm_widget graph_dapm_widgets[] = {
                               SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
 };
 
-static int graph_startup(struct snd_pcm_substream *substream)
-{
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       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_clk_enable(dai_props->cpu_dai);
-       if (ret)
-               return ret;
-
-       ret = asoc_simple_card_clk_enable(dai_props->codec_dai);
-       if (ret)
-               asoc_simple_card_clk_disable(dai_props->cpu_dai);
-
-       return ret;
-}
-
 static void graph_shutdown(struct snd_pcm_substream *substream)
 {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -117,7 +99,7 @@ err:
 }
 
 static const struct snd_soc_ops graph_ops = {
-       .startup        = graph_startup,
+       .startup        = asoc_simple_startup,
        .shutdown       = graph_shutdown,
        .hw_params      = graph_hw_params,
 };

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index f5ba5ad300ccdf8958816103734673338d1e0fe1..83ea1afa3c72b5a9cacb5cd2f5c7ef3e479d0e99 100644 (file)
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -143,14 +143,13 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card,
 }
 EXPORT_SYMBOL_GPL(asoc_simple_card_parse_card_name);
 
-int asoc_simple_card_clk_enable(struct asoc_simple_dai *dai)
+static int asoc_simple_card_clk_enable(struct asoc_simple_dai *dai)
 {
        if (dai)
                return clk_prepare_enable(dai->clk);
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(asoc_simple_card_clk_enable);
 
 void asoc_simple_card_clk_disable(struct asoc_simple_dai *dai)
 {
@@ -206,6 +205,25 @@ int asoc_simple_card_parse_clk(struct device *dev,
 }
 EXPORT_SYMBOL_GPL(asoc_simple_card_parse_clk);
 
+int asoc_simple_startup(struct snd_pcm_substream *substream)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       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_clk_enable(dai_props->cpu_dai);
+       if (ret)
+               return ret;
+
+       ret = asoc_simple_card_clk_enable(dai_props->codec_dai);
+       if (ret)
+               asoc_simple_card_clk_disable(dai_props->cpu_dai);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(asoc_simple_startup);
+
 int asoc_simple_card_parse_dai(struct device_node *node,
                                    struct snd_soc_dai_link_component *dlc,
                                    struct device_node **dai_of_node,

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 628c19a3aaffba17e044812b1f78b7662656869f..d0ea5736889eeed50d5431fc5208fcd1567589f2 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -26,25 +26,6 @@ struct link_info {
 #define CELL   "#sound-dai-cells"
 #define PREFIX "simple-audio-card,"
 
-static int simple_startup(struct snd_pcm_substream *substream)
-{
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       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_clk_enable(dai_props->cpu_dai);
-       if (ret)
-               return ret;
-
-       ret = asoc_simple_card_clk_enable(dai_props->codec_dai);
-       if (ret)
-               asoc_simple_card_clk_disable(dai_props->cpu_dai);
-
-       return ret;
-}
-
 static void simple_shutdown(struct snd_pcm_substream *substream)
 {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -114,7 +95,7 @@ err:
 }
 
 static const struct snd_soc_ops simple_ops = {
-       .startup        = simple_startup,
+       .startup        = asoc_simple_startup,
        .shutdown       = simple_shutdown,
        .hw_params      = simple_hw_params,
 };