summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-04-19 12:14:10 +0100
committerMark Brown <broonie@kernel.org>2018-04-19 12:15:03 +0100
commit291bfb928863d496e25c785e132a8fbfb32341a8 (patch)
tree114642025e9922a9e5121fde85f7413f5fa278f8 /include/sound
parent24ada03555505205b0c8b8b796d52926600bf947 (diff)
ASoC: topology: Revert recent changes while boot errors are investigated
Krzysztof Kozlowski reported a NULL dereference in _instantiate_card() on Odroid XU3 and XU boards which he bisected to 45f8cb57da0d7 (ASoC: core: Allow topology to override machine driver FE DAI link config). Revert that commit for now, along with f11a5c27f928 (ASoC: core: Add name prefix for machines with topology rewrites) due to dependency issues, in order to keep things booting cleanly in -next. Reported-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 3676d0a8f532..ad266d7e9553 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1012,14 +1012,6 @@ struct snd_soc_platform_driver {
/* platform stream compress ops */
const struct snd_compr_ops *compr_ops;
-
- /* this platform uses topology and ignore machine driver FEs */
- const char *ignore_machine;
- const char *topology_name_prefix;
- int (*be_hw_params_fixup)(struct snd_soc_pcm_runtime *rtd,
- struct snd_pcm_hw_params *params);
- bool use_dai_pcm_id; /* use the DAI link PCM ID as PCM device number */
- int be_pcm_base; /* base device ID for all BE PCMs */
};
struct snd_soc_dai_link_component {
@@ -1126,9 +1118,6 @@ struct snd_soc_dai_link {
/* pmdown_time is ignored at stop */
unsigned int ignore_pmdown_time:1;
- /* Do not create a PCM for this DAI link (Backend link) */
- unsigned int ignore:1;
-
struct list_head list; /* DAI link list of the soc card */
struct snd_soc_dobj dobj; /* For topology */
};
@@ -1168,7 +1157,6 @@ struct snd_soc_card {
const char *long_name;
const char *driver_name;
char dmi_longname[80];
- char topology_shortname[32];
struct device *dev;
struct snd_card *snd_card;