diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-03 10:39:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-03 10:39:48 +0100 |
| commit | 641783ac27698c5d520751d9cebcdd79a51d137f (patch) | |
| tree | 7865ad3b5d7f4b44e6a5fb123b82a90a404ce2fe /sound/soc | |
| parent | edc3596fada314ce6af07d435500166784b8135b (diff) | |
| parent | 2896b8b4d8f3feaca9c09f7a15e86f8c8b32d7dc (diff) | |
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/davinci/davinci-evm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index cab98a580053..a50010e2891f 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -38,7 +38,7 @@ struct snd_soc_card_drvdata_davinci { static int evm_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_card *soc_card = rtd->codec->card; + struct snd_soc_card *soc_card = rtd->card; struct snd_soc_card_drvdata_davinci *drvdata = snd_soc_card_get_drvdata(soc_card); @@ -51,7 +51,7 @@ static int evm_startup(struct snd_pcm_substream *substream) static void evm_shutdown(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_card *soc_card = rtd->codec->card; + struct snd_soc_card *soc_card = rtd->card; struct snd_soc_card_drvdata_davinci *drvdata = snd_soc_card_get_drvdata(soc_card); @@ -65,8 +65,7 @@ static int evm_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - struct snd_soc_codec *codec = rtd->codec; - struct snd_soc_card *soc_card = codec->card; + struct snd_soc_card *soc_card = rtd->card; int ret = 0; unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *) snd_soc_card_get_drvdata(soc_card))->sysclk; @@ -125,7 +124,7 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct snd_soc_codec *codec = rtd->codec; - struct device_node *np = codec->card->dev->of_node; + struct device_node *np = card->dev->of_node; int ret; /* Add davinci-evm specific widgets */ |