aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/cs4270.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-23 17:55:23 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-27 05:30:54 -0500
commit6627a653bceb3a54e55e5cdc478ec5b8d5c9cc44 (patch)
tree9a6f157ad1123e4f047689bbf3c4ef88ec1259a4 /sound/soc/codecs/cs4270.c
parent0db4d0705260dd4bddf1e5a5441c58bdf08bdc9f (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/cs4270.c')
-rw-r--r--sound/soc/codecs/cs4270.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 2aa12fdbd2ca..21253b48289f 100644
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -350,7 +350,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream,
350{ 350{
351 struct snd_soc_pcm_runtime *rtd = substream->private_data; 351 struct snd_soc_pcm_runtime *rtd = substream->private_data;
352 struct snd_soc_device *socdev = rtd->socdev; 352 struct snd_soc_device *socdev = rtd->socdev;
353 struct snd_soc_codec *codec = socdev->codec; 353 struct snd_soc_codec *codec = socdev->card->codec;
354 struct cs4270_private *cs4270 = codec->private_data; 354 struct cs4270_private *cs4270 = codec->private_data;
355 int ret; 355 int ret;
356 unsigned int i; 356 unsigned int i;
@@ -575,7 +575,7 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client,
575 return -ENOMEM; 575 return -ENOMEM;
576 } 576 }
577 codec = &cs4270->codec; 577 codec = &cs4270->codec;
578 socdev->codec = codec; 578 socdev->card->codec = codec;
579 579
580 mutex_init(&codec->mutex); 580 mutex_init(&codec->mutex);
581 INIT_LIST_HEAD(&codec->dapm_widgets); 581 INIT_LIST_HEAD(&codec->dapm_widgets);
@@ -653,7 +653,7 @@ error_free_codec:
653static int cs4270_i2c_remove(struct i2c_client *i2c_client) 653static int cs4270_i2c_remove(struct i2c_client *i2c_client)
654{ 654{
655 struct snd_soc_device *socdev = i2c_get_clientdata(i2c_client); 655 struct snd_soc_device *socdev = i2c_get_clientdata(i2c_client);
656 struct snd_soc_codec *codec = socdev->codec; 656 struct snd_soc_codec *codec = socdev->card->codec;
657 struct cs4270_private *cs4270 = codec->private_data; 657 struct cs4270_private *cs4270 = codec->private_data;
658 658
659 snd_soc_free_pcms(socdev); 659 snd_soc_free_pcms(socdev);