aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-07-17 16:01:07 -0400
committerMark Brown <broonie@linaro.org>2014-07-22 18:15:57 -0400
commit00200107a296cad3a950049a5ad7134a0d962b8d (patch)
tree73ccc523f1a46f0f8b7deab226a1df0cf6d057ed /sound/soc/soc-dapm.c
parent093c4e5c3cc6dd320f6cfec54c5490d1567fb05c (diff)
ASoC: Move card field form platform/codec to component
Both the snd_soc_codec and snd_soc_platform struct do have a pointer to the parent card and both handle this pointer in mostly the same way. This patch moves the card field to the component level which will allow further code consolidation between platforms and CODECS. Since there are only a handful of users of the snd_soc_codec struct's card field (and none of the snd_soc_platform's) these are update in this patch as well, which allows it to be removed from the snd_soc_codec struct. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 8cb68a38ad19..8348352dc2c6 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2090,7 +2090,7 @@ static ssize_t dapm_widget_show_codec(struct snd_soc_codec *codec, char *buf)
2090 int count = 0; 2090 int count = 0;
2091 char *state = "not set"; 2091 char *state = "not set";
2092 2092
2093 list_for_each_entry(w, &codec->card->widgets, list) { 2093 list_for_each_entry(w, &codec->component.card->widgets, list) {
2094 if (w->dapm != &codec->dapm) 2094 if (w->dapm != &codec->dapm)
2095 continue; 2095 continue;
2096 2096