diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-23 17:55:23 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-27 05:30:54 -0500 |
commit | 6627a653bceb3a54e55e5cdc478ec5b8d5c9cc44 (patch) | |
tree | 9a6f157ad1123e4f047689bbf3c4ef88ec1259a4 /sound/soc/codecs/ad73311.c | |
parent | 0db4d0705260dd4bddf1e5a5441c58bdf08bdc9f (diff) |
ASoC: Push the codec runtime storage into the card structure
This is a further stage on the road to refactoring away the ASoC
platform device.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/ad73311.c')
-rw-r--r-- | sound/soc/codecs/ad73311.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/ad73311.c b/sound/soc/codecs/ad73311.c index b09289a1e55a..e61dac5e7b8f 100644 --- a/sound/soc/codecs/ad73311.c +++ b/sound/soc/codecs/ad73311.c | |||
@@ -53,7 +53,7 @@ static int ad73311_soc_probe(struct platform_device *pdev) | |||
53 | codec->owner = THIS_MODULE; | 53 | codec->owner = THIS_MODULE; |
54 | codec->dai = &ad73311_dai; | 54 | codec->dai = &ad73311_dai; |
55 | codec->num_dai = 1; | 55 | codec->num_dai = 1; |
56 | socdev->codec = codec; | 56 | socdev->card->codec = codec; |
57 | INIT_LIST_HEAD(&codec->dapm_widgets); | 57 | INIT_LIST_HEAD(&codec->dapm_widgets); |
58 | INIT_LIST_HEAD(&codec->dapm_paths); | 58 | INIT_LIST_HEAD(&codec->dapm_paths); |
59 | 59 | ||
@@ -75,15 +75,15 @@ static int ad73311_soc_probe(struct platform_device *pdev) | |||
75 | register_err: | 75 | register_err: |
76 | snd_soc_free_pcms(socdev); | 76 | snd_soc_free_pcms(socdev); |
77 | pcm_err: | 77 | pcm_err: |
78 | kfree(socdev->codec); | 78 | kfree(socdev->card->codec); |
79 | socdev->codec = NULL; | 79 | socdev->card->codec = NULL; |
80 | return ret; | 80 | return ret; |
81 | } | 81 | } |
82 | 82 | ||
83 | static int ad73311_soc_remove(struct platform_device *pdev) | 83 | static int ad73311_soc_remove(struct platform_device *pdev) |
84 | { | 84 | { |
85 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | 85 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); |
86 | struct snd_soc_codec *codec = socdev->codec; | 86 | struct snd_soc_codec *codec = socdev->card->codec; |
87 | 87 | ||
88 | if (codec == NULL) | 88 | if (codec == NULL) |
89 | return 0; | 89 | return 0; |