ASoC: remove snd_soc_dai_link_set_capabilities()

dpcm_xxx flags are no longer needed.

We need to use xxx_only flags instead if needed, but
snd_soc_dai_link_set_capabilities() user adds dpcm_xxx if playback/capture
were available. Thus converting dpcm_xxx to xxx_only is not needed.
Just remove it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://patch.msgid.link/87r0aiaahh.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index ab4e109fe71d2243f5fe0fb83ccd5972980c0b63..0d1b215f24f4f020eae052f0ce9ca4ebb8f24d5e 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -219,7 +219,6 @@ void snd_soc_dai_resume(struct snd_soc_dai *dai);
 int snd_soc_dai_compress_new(struct snd_soc_dai *dai,
                             struct snd_soc_pcm_runtime *rtd, int num);
 bool snd_soc_dai_stream_valid(const struct snd_soc_dai *dai, int stream);
-void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link);
 void snd_soc_dai_action(struct snd_soc_dai *dai,
                        int stream, int action);
 static inline void snd_soc_dai_activate(struct snd_soc_dai *dai,

diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c
index 0e18ccabe28c315f34f073bc7ec15e5eeefebbe2..98b37dd2b9013fa3ad81b7ba2610840fa5a1519c 100644 (file)
--- a/sound/soc/fsl/imx-card.c
+++ b/sound/soc/fsl/imx-card.c
@@ -650,9 +650,6 @@ static int imx_card_parse_of(struct imx_card_data *data)
                        link->ops = &imx_aif_ops;
                }
 
-               if (link->no_pcm || link->dynamic)
-                       snd_soc_dai_link_set_capabilities(link);
-
                /* Get dai fmt */
                ret = simple_util_parse_daifmt(dev, np, codec,
                                               NULL, &link->dai_fmt);

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 3425fbbcbd7e9c6a580b8eb0739462bf21dfc051..1bdcfc4d4222ecd2a807b147512572dc184b4ed5 100644 (file)
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -279,8 +279,6 @@ static int graph_dai_link_of_dpcm(struct simple_util_priv *priv,
 
        graph_parse_convert(dev, ep, &dai_props->adata);
 
-       snd_soc_dai_link_set_capabilities(dai_link);
-
        ret = graph_link_init(priv, cpu_ep, codec_ep, li, dai_name);
 
        li->link++;

diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c
index 56f7f946882e831cc4474c86b31f69e15de1549a..051adb56739728e282a6fe958271113d6aec17d8 100644 (file)
--- a/sound/soc/generic/audio-graph-card2.c
+++ b/sound/soc/generic/audio-graph-card2.c
@@ -966,8 +966,6 @@ int audio_graph2_link_dpcm(struct simple_util_priv *priv,
        graph_parse_convert(ep,  dai_props); /* at node of <dpcm> */
        graph_parse_convert(rep, dai_props); /* at node of <CPU/Codec> */
 
-       snd_soc_dai_link_set_capabilities(dai_link);
-
        graph_link_init(priv, lnk, cpu_port, codec_port, li, is_cpu);
 err:
        of_node_put(ep);

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index d2588f1ea54e52a0784b11ebd8d3be2a1b1fe857..42c60b92cca5c96cb714360ef4cfa662c459e4d6 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -291,8 +291,6 @@ static int simple_dai_link_of_dpcm(struct simple_util_priv *priv,
 
        simple_parse_convert(dev, np, &dai_props->adata);
 
-       snd_soc_dai_link_set_capabilities(dai_link);
-
        ret = simple_link_init(priv, np, codec, li, prefix, dai_name);
 
 out_put_node:

diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c
index 8c5605c1e34e8a1bf29e4256ba9625b94205c762..09aa36e94c85bea25213bb6efcd3f3c107da9735 100644 (file)
--- a/sound/soc/meson/axg-card.c
+++ b/sound/soc/meson/axg-card.c
@@ -339,7 +339,6 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np,
                dai_link->num_c2c_params = 1;
        } else {
                dai_link->no_pcm = 1;
-               snd_soc_dai_link_set_capabilities(dai_link);
                if (axg_card_cpu_is_tdm_iface(dai_link->cpus->of_node))
                        ret = axg_card_parse_tdm(card, np, index);
        }

diff --git a/sound/soc/meson/gx-card.c b/sound/soc/meson/gx-card.c
index f1539e542638d5af8198e073f3df0723b55bb68e..7edca3e49c8f0036eca73161cff1de9b336ece90 100644 (file)
--- a/sound/soc/meson/gx-card.c
+++ b/sound/soc/meson/gx-card.c
@@ -107,7 +107,6 @@ static int gx_card_add_link(struct snd_soc_card *card, struct device_node *np,
                dai_link->num_c2c_params = 1;
        } else {
                dai_link->no_pcm = 1;
-               snd_soc_dai_link_set_capabilities(dai_link);
                /* Check if the cpu is the i2s encoder and parse i2s data */
                if (gx_card_cpu_identify(dai_link->cpus, "I2S Encoder"))
                        ret = gx_card_parse_i2s(card, np, index);

diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c
index 56b4a3654aec3becebe14833e3d043a6c686b7fe..928cf5cb599972f9582faccb58de2cf43b50074c 100644 (file)
--- a/sound/soc/qcom/common.c
+++ b/sound/soc/qcom/common.c
@@ -155,7 +155,6 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
 
                if (platform || !codec) {
                        /* DPCM */
-                       snd_soc_dai_link_set_capabilities(link);
                        link->ignore_suspend = 1;
                        link->nonatomic = 1;
                }

diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index 302ca753a1f35554a2385249acfdbd879eb05a7d..4e08892d24c62d2fb4c9fc309b6019d1044f27e8 100644 (file)
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -479,44 +479,6 @@ bool snd_soc_dai_stream_valid(const struct snd_soc_dai *dai, int dir)
        return stream->channels_min;
 }
 
-/*
- * snd_soc_dai_link_set_capabilities() - set dai_link properties based on its DAIs
- */
-void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link)
-{
-       bool supported[SNDRV_PCM_STREAM_LAST + 1];
-       int direction;
-
-       for_each_pcm_streams(direction) {
-               struct snd_soc_dai_link_component *cpu;
-               struct snd_soc_dai_link_component *codec;
-               struct snd_soc_dai *dai;
-               bool supported_cpu = false;
-               bool supported_codec = false;
-               int i;
-
-               for_each_link_cpus(dai_link, i, cpu) {
-                       dai = snd_soc_find_dai_with_mutex(cpu);
-                       if (dai && snd_soc_dai_stream_valid(dai, direction)) {
-                               supported_cpu = true;
-                               break;
-                       }
-               }
-               for_each_link_codecs(dai_link, i, codec) {
-                       dai = snd_soc_find_dai_with_mutex(codec);
-                       if (dai && snd_soc_dai_stream_valid(dai, direction)) {
-                               supported_codec = true;
-                               break;
-                       }
-               }
-               supported[direction] = supported_cpu && supported_codec;
-       }
-
-       dai_link->dpcm_playback = supported[SNDRV_PCM_STREAM_PLAYBACK];
-       dai_link->dpcm_capture  = supported[SNDRV_PCM_STREAM_CAPTURE];
-}
-EXPORT_SYMBOL_GPL(snd_soc_dai_link_set_capabilities);
-
 void snd_soc_dai_action(struct snd_soc_dai *dai,
                        int stream, int action)
 {