xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "BACKPORT: ASoC: soc-pcm: Get all BEs along DAPM path"

Browse Source 
This reverts commit c82dbcbec1.

Reason for revert: use vendor_hook approach instead of adding a new field.

Change-Id: I001dafc1b90cfe4567a13f538c2f8d25a0929504
Signed-off-by: Bicycle Tsai <bicycle.tsai@mediatek.corp-partner.google.com>
This commit is contained in:
Bicycle Tsai
2021-10-26 01:14:03 +00:00
parent a84e45d3c3
commit 16493a3c87
3 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/sound/soc.h
View File

@@ -1105,12 +1105,6 @@ struct snd_soc_card {
ANDROID_KABI_RESERVE(3); ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4); ANDROID_KABI_RESERVE(4);
}; };
struct snd_soc_card_ext {
struct snd_soc_card card;
unsigned int component_chaining:1;
};
#define for_each_card_prelinks(card, i, link) \ #define for_each_card_prelinks(card, i, link) \
for ((i) = 0; \ for ((i) = 0; \
((i) < (card)->num_links) && ((link) = &(card)->dai_link[i]); \ ((i) < (card)->num_links) && ((link) = &(card)->dai_link[i]); \

8
sound/soc/soc-core.c
View File

@@ -2175,17 +2175,9 @@ EXPORT_SYMBOL_GPL(snd_soc_add_dai_controls);
*/ */
int snd_soc_register_card(struct snd_soc_card *card) int snd_soc_register_card(struct snd_soc_card *card)
{ {
struct snd_soc_card_ext *card_ext;
if (!card->name || !card->dev) if (!card->name || !card->dev)
return -EINVAL; return -EINVAL;
card_ext = devm_kzalloc(card->dev,
sizeof(struct snd_soc_card_ext), GFP_KERNEL);
memcpy(&card_ext->card, card, sizeof(struct snd_soc_card));
card = &card_ext->card;
dev_set_drvdata(card->dev, card); dev_set_drvdata(card->dev, card);
INIT_LIST_HEAD(&card->widgets); INIT_LIST_HEAD(&card->widgets);

6
sound/soc/soc-pcm.c
View File

@@ -1274,7 +1274,6 @@ int dpcm_path_get(struct snd_soc_pcm_runtime *fe,
int stream, struct snd_soc_dapm_widget_list **list) int stream, struct snd_soc_dapm_widget_list **list)
{ {
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(fe, 0); struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(fe, 0);
struct snd_soc_card_ext *card_ext;
int paths; int paths;
if (fe->num_cpus > 1) { if (fe->num_cpus > 1) {
@@ -1283,12 +1282,9 @@ int dpcm_path_get(struct snd_soc_pcm_runtime *fe,
return -EINVAL; return -EINVAL;
} }
card_ext = container_of(fe->card, struct snd_soc_card_ext, card);
/* get number of valid DAI paths and their widgets */ /* get number of valid DAI paths and their widgets */
paths = snd_soc_dapm_dai_get_connected_widgets(cpu_dai, stream, list, paths = snd_soc_dapm_dai_get_connected_widgets(cpu_dai, stream, list,
card_ext->component_chaining ? dpcm_end_walk_at_be);
NULL : dpcm_end_walk_at_be);
dev_dbg(fe->dev, "ASoC: found %d audio %s paths\n", paths, dev_dbg(fe->dev, "ASoC: found %d audio %s paths\n", paths,
stream ? "capture" : "playback"); stream ? "capture" : "playback");