diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-07-17 22:01:07 +0200 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-07-22 23:15:57 +0100 |
commit | 00200107a296cad3a950049a5ad7134a0d962b8d (patch) | |
tree | 73ccc523f1a46f0f8b7deab226a1df0cf6d057ed /sound/soc/codecs/uda134x.c | |
parent | 093c4e5c3cc6dd320f6cfec54c5490d1567fb05c (diff) | |
download | linux-stable-00200107a296cad3a950049a5ad7134a0d962b8d.tar.gz linux-stable-00200107a296cad3a950049a5ad7134a0d962b8d.tar.bz2 linux-stable-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 'sound/soc/codecs/uda134x.c')
-rw-r--r-- | sound/soc/codecs/uda134x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c index edf27acc1d77..12fc0aed7503 100644 --- a/sound/soc/codecs/uda134x.c +++ b/sound/soc/codecs/uda134x.c @@ -479,7 +479,7 @@ static struct snd_soc_dai_driver uda134x_dai = { static int uda134x_soc_probe(struct snd_soc_codec *codec) { struct uda134x_priv *uda134x; - struct uda134x_platform_data *pd = codec->card->dev->platform_data; + struct uda134x_platform_data *pd = codec->component.card->dev->platform_data; const struct snd_soc_dapm_widget *widgets; unsigned num_widgets; |