summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-08-20 11:08:49 (GMT)
committerMark Brown <broonie@linaro.org>2014-09-06 13:46:30 (GMT)
commit0634814fe0f29a46c44386a03f259f99c983bf7e (patch)
tree5225f367554fba11a2fadfa0234d72acbbeb15ff /sound/soc
parent923976a30b36ce0970e88f53ed2f2b5b61aeeb73 (diff)
downloadlinux-0634814fe0f29a46c44386a03f259f99c983bf7e.tar.xz
ASoC: Remove table based DAPM/control setup support from snd_soc_platform_driver
There are no users left and new users should rather use the component_driver struct embedded in the snd_soc_platform_driver struct to do this. E.g.: static const struct snd_soc_platform_driver foobar_driver = { .component_driver = { .dapm_widgets = ..., .num_dapm_widgets = ..., ..., }, ... }; instead of static const struct snd_soc_platform_driver foobar_driver = { .dapm_widgets = ..., .num_dapm_widgets = ..., ... }; This also allows us to remove the steal_sibling_dai_widgets hack. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-core.c58
1 files changed, 6 insertions, 52 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 1b422c5..052f59c 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1087,7 +1087,6 @@ static int soc_probe_component(struct snd_soc_card *card,
struct snd_soc_component *component)
{
struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
- struct snd_soc_component *dai_component, *component2;
struct snd_soc_dai *dai;
int ret;
@@ -1114,44 +1113,12 @@ static int soc_probe_component(struct snd_soc_card *card,
}
}
- /*
- * This is rather ugly, but certain platforms expect that the DAPM
- * widgets for the DAIs for components with the same parent device are
- * created in the platforms DAPM context. Until that is fixed we need to
- * keep this.
- */
- if (component->steal_sibling_dai_widgets) {
- dai_component = NULL;
- list_for_each_entry(component2, &component_list, list) {
- if (component == component2)
- continue;
-
- if (component2->dev == component->dev &&
- !list_empty(&component2->dai_list)) {
- dai_component = component2;
- break;
- }
- }
- } else {
- dai_component = component;
- list_for_each_entry(component2, &component_list, list) {
- if (component2->dev == component->dev &&
- component2->steal_sibling_dai_widgets) {
- dai_component = NULL;
- break;
- }
- }
- }
-
- if (dai_component) {
- list_for_each_entry(dai, &dai_component->dai_list, list) {
- snd_soc_dapm_new_dai_widgets(dapm, dai);
- if (ret != 0) {
- dev_err(component->dev,
- "Failed to create DAI widgets %d\n",
- ret);
- goto err_probe;
- }
+ list_for_each_entry(dai, &component->dai_list, list) {
+ ret = snd_soc_dapm_new_dai_widgets(dapm, dai);
+ if (ret != 0) {
+ dev_err(component->dev,
+ "Failed to create DAI widgets %d\n", ret);
+ goto err_probe;
}
}
@@ -4164,19 +4131,6 @@ int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform,
platform->dev = dev;
platform->driver = platform_drv;
- if (platform_drv->controls) {
- platform->component.controls = platform_drv->controls;
- platform->component.num_controls = platform_drv->num_controls;
- }
- if (platform_drv->dapm_widgets) {
- platform->component.dapm_widgets = platform_drv->dapm_widgets;
- platform->component.num_dapm_widgets = platform_drv->num_dapm_widgets;
- platform->component.steal_sibling_dai_widgets = true;
- }
- if (platform_drv->dapm_routes) {
- platform->component.dapm_routes = platform_drv->dapm_routes;
- platform->component.num_dapm_routes = platform_drv->num_dapm_routes;
- }
if (platform_drv->probe)
platform->component.probe = snd_soc_platform_drv_probe;