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

ASoC: simple_card_utils.c: use asoc_dummy_dlc 



Now we can share asoc_dummy_dlc. This patch use it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87ttx6ypi3.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/simple_card_utils.h

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ struct asoc_simple_priv { 
	struct snd_soc_dai_link *dai_link;

	struct asoc_simple_dai *dais;

	struct snd_soc_dai_link_component *dlcs;

	struct snd_soc_dai_link_component dummy;

	struct snd_soc_codec_conf *codec_conf;

	struct gpio_desc *pa_gpio;

	const struct snd_soc_ops *ops;

sound/soc/generic/simple-card-utils.c

+2 −7
Original line number Diff line number Diff line
@@ -889,11 +889,6 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, 
	dev_dbg(dev, "link %d, dais %d, ccnf %d\n",

		li->link, dai_num, cnf_num);



	/* dummy CPU/Codec */

	priv->dummy.of_node	= NULL;

	priv->dummy.dai_name	= "snd-soc-dummy-dai";

	priv->dummy.name	= "snd-soc-dummy";



	priv->dai_props		= dai_props;

	priv->dai_link		= dai_link;

	priv->dais		= dais;
@@ -919,7 +914,7 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, 
		} else {

			/* DPCM Be's CPU = dummy */

			dai_props[i].cpus	=

			dai_link[i].cpus	= &priv->dummy;

			dai_link[i].cpus	= &asoc_dummy_dlc;

			dai_props[i].num.cpus	=

			dai_link[i].num_cpus	= 1;

		}
@@ -943,7 +938,7 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, 
		} else {

			/* DPCM Fe's Codec = dummy */

			dai_props[i].codecs	=

			dai_link[i].codecs	= &priv->dummy;

			dai_link[i].codecs	= &asoc_dummy_dlc;

			dai_props[i].num.codecs	=

			dai_link[i].num_codecs	= 1;

		}