tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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 050c7950fd70 ("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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87bkhhxpc6.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown 45b4ad53 fed4be31

-9
-3
include/sound/simple_card_utils.h
··· 59 59 struct simple_dai_props { 60 60 struct asoc_simple_dai *cpu_dai; 61 61 struct asoc_simple_dai *codec_dai; 62 - struct snd_soc_dai_link_component *cpus; 63 - struct snd_soc_dai_link_component *codecs; 64 - struct snd_soc_dai_link_component *platforms; 65 62 struct asoc_simple_data adata; 66 63 struct snd_soc_codec_conf *codec_conf; 67 64 struct prop_nums num;
-6
sound/soc/generic/simple-card-utils.c
··· 903 903 for (i = 0; i < li->link; i++) { 904 904 if (li->num[i].cpus) { 905 905 /* Normal CPU */ 906 - dai_props[i].cpus = 907 906 dai_link[i].cpus = dlcs; 908 907 dai_props[i].num.cpus = 909 908 dai_link[i].num_cpus = li->num[i].cpus; ··· 912 913 dais += li->num[i].cpus; 913 914 } else { 914 915 /* DPCM Be's CPU = dummy */ 915 - dai_props[i].cpus = 916 916 dai_link[i].cpus = &asoc_dummy_dlc; 917 917 dai_props[i].num.cpus = 918 918 dai_link[i].num_cpus = 1; ··· 919 921 920 922 if (li->num[i].codecs) { 921 923 /* Normal Codec */ 922 - dai_props[i].codecs = 923 924 dai_link[i].codecs = dlcs; 924 925 dai_props[i].num.codecs = 925 926 dai_link[i].num_codecs = li->num[i].codecs; ··· 934 937 } 935 938 } else { 936 939 /* DPCM Fe's Codec = dummy */ 937 - dai_props[i].codecs = 938 940 dai_link[i].codecs = &asoc_dummy_dlc; 939 941 dai_props[i].num.codecs = 940 942 dai_link[i].num_codecs = 1; ··· 941 945 942 946 if (li->num[i].platforms) { 943 947 /* Have Platform */ 944 - dai_props[i].platforms = 945 948 dai_link[i].platforms = dlcs; 946 949 dai_props[i].num.platforms = 947 950 dai_link[i].num_platforms = li->num[i].platforms; ··· 948 953 dlcs += li->num[i].platforms; 949 954 } else { 950 955 /* Doesn't have Platform */ 951 - dai_props[i].platforms = 952 956 dai_link[i].platforms = NULL; 953 957 dai_props[i].num.platforms = 954 958 dai_link[i].num_platforms = 0;