diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-07-17 22:01:07 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-23 00:15:57 +0200 |
| commit | 00200107a296cad3a950049a5ad7134a0d962b8d (patch) | |
| tree | 73ccc523f1a46f0f8b7deab226a1df0cf6d057ed /include/sound/soc.h | |
| parent | ASoC: tegra: Replace instances of rtd->codec->card with rtd->card (diff) | |
| download | linux-00200107a296cad3a950049a5ad7134a0d962b8d.tar.xz linux-00200107a296cad3a950049a5ad7134a0d962b8d.zip | |
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 'include/sound/soc.h')
| -rw-r--r-- | include/sound/soc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 1f5b4901415e..5ee6ddde4831 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -691,6 +691,7 @@ struct snd_soc_component { int id; const char *name_prefix; struct device *dev; + struct snd_soc_card *card; unsigned int active; @@ -725,7 +726,6 @@ struct snd_soc_codec { const struct snd_soc_codec_driver *driver; struct mutex mutex; - struct snd_soc_card *card; struct list_head list; struct list_head card_list; @@ -863,7 +863,6 @@ struct snd_soc_platform { unsigned int suspended:1; /* platform is suspended */ unsigned int probed:1; - struct snd_soc_card *card; struct list_head list; struct snd_soc_component component; |