Unverified Commit 12806510 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Link: https://patch.msgid.link/87r0aiaahh.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fd69dfe6

include/sound/soc-dai.h

+0 −1
Original line number Diff line number Diff line
@@ -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,

sound/soc/fsl/imx-card.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

sound/soc/generic/audio-graph-card.c

+0 −2
Original line number Diff line number Diff line
@@ -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++;

sound/soc/generic/audio-graph-card2.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

sound/soc/generic/simple-card.c

+0 −2
Original line number Diff line number Diff line
@@ -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: