diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-06-16 18:13:11 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-21 22:36:09 +0200 |
| commit | 88a8fe3df65fa0229b04f1c03411062230091cdd (patch) | |
| tree | acd0492c3050cb7b8fa4d44c459d34be8ecb9858 /sound | |
| parent | ASoC: dapm: Remove DAI DAPM context (diff) | |
| download | linux-88a8fe3df65fa0229b04f1c03411062230091cdd.tar.xz linux-88a8fe3df65fa0229b04f1c03411062230091cdd.zip | |
ASoC: dapm: Remove platform field from widget and dapm context struct
The platform field in the snd_soc_dapm_widget and snd_soc_dapm_context structs
is now unused can be removed. New code that wants to get the platform for a
widget or dapm context should use snd_soc_dapm_to_platform(w->dapm) or
snd_soc_dapm_to_platform(dapm).
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 1 | ||||
| -rw-r--r-- | sound/soc/soc-dapm.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 995a4b7f87eb..19c1e9588e05 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -4159,7 +4159,6 @@ int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform, platform->dev = dev; platform->driver = platform_drv; - platform->component.dapm.platform = platform; if (platform_drv->write) platform->component.write = snd_soc_platform_drv_write; if (platform_drv->read) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 4702b926a6a0..4bf08cffd1f1 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3097,7 +3097,6 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, w->dapm = dapm; w->codec = dapm->codec; - w->platform = dapm->platform; INIT_LIST_HEAD(&w->sources); INIT_LIST_HEAD(&w->sinks); INIT_LIST_HEAD(&w->list); |