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

ASoC: simple_card_utils: remove unused cpus/codecs/platforms from props 



simple_dai_props has cpus/codecs/platforms. These pointer were used
for dai_link before, but are allocated today since
commit 050c7950 ("ASoC: simple-card-utils: alloc dai_link
information for CPU/Codec/Platform").
We don't need to keep it anymore. This patch removes these.

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


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

include/sound/simple_card_utils.h

+0 −3
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ struct asoc_simple_priv { 
	struct simple_dai_props {

		struct asoc_simple_dai *cpu_dai;

		struct asoc_simple_dai *codec_dai;

		struct snd_soc_dai_link_component *cpus;

		struct snd_soc_dai_link_component *codecs;

		struct snd_soc_dai_link_component *platforms;

		struct asoc_simple_data adata;

		struct snd_soc_codec_conf *codec_conf;

		struct prop_nums num;

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

+0 −6
Original line number Diff line number Diff line
@@ -903,7 +903,6 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, 
	for (i = 0; i < li->link; i++) {

		if (li->num[i].cpus) {

			/* Normal CPU */

			dai_props[i].cpus	=

			dai_link[i].cpus	= dlcs;

			dai_props[i].num.cpus	=

			dai_link[i].num_cpus	= li->num[i].cpus;
@@ -913,7 +912,6 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, 
			dais += li->num[i].cpus;

		} else {

			/* DPCM Be's CPU = dummy */

			dai_props[i].cpus	=

			dai_link[i].cpus	= &asoc_dummy_dlc;

			dai_props[i].num.cpus	=

			dai_link[i].num_cpus	= 1;
@@ -921,7 +919,6 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, 


		if (li->num[i].codecs) {

			/* Normal Codec */

			dai_props[i].codecs	=

			dai_link[i].codecs	= dlcs;

			dai_props[i].num.codecs	=

			dai_link[i].num_codecs	= li->num[i].codecs;
@@ -937,7 +934,6 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, 
			}

		} else {

			/* DPCM Fe's Codec = dummy */

			dai_props[i].codecs	=

			dai_link[i].codecs	= &asoc_dummy_dlc;

			dai_props[i].num.codecs	=

			dai_link[i].num_codecs	= 1;
@@ -945,7 +941,6 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, 


		if (li->num[i].platforms) {

			/* Have Platform */

			dai_props[i].platforms		=

			dai_link[i].platforms		= dlcs;

			dai_props[i].num.platforms	=

			dai_link[i].num_platforms	= li->num[i].platforms;
@@ -953,7 +948,6 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, 
			dlcs += li->num[i].platforms;

		} else {

			/* Doesn't have Platform */

			dai_props[i].platforms		=

			dai_link[i].platforms		= NULL;

			dai_props[i].num.platforms	=

			dai_link[i].num_platforms	= 0;