diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-03 05:39:48 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-03 05:39:48 -0400 |
| commit | 641783ac27698c5d520751d9cebcdd79a51d137f (patch) | |
| tree | 7865ad3b5d7f4b44e6a5fb123b82a90a404ce2fe /sound | |
| parent | edc3596fada314ce6af07d435500166784b8135b (diff) | |
| parent | 2896b8b4d8f3feaca9c09f7a15e86f8c8b32d7dc (diff) | |
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
Diffstat (limited to 'sound')
| -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 { | |||
| 38 | static int evm_startup(struct snd_pcm_substream *substream) | 38 | static int evm_startup(struct snd_pcm_substream *substream) |
| 39 | { | 39 | { |
| 40 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 40 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
| 41 | struct snd_soc_card *soc_card = rtd->codec->card; | 41 | struct snd_soc_card *soc_card = rtd->card; |
| 42 | struct snd_soc_card_drvdata_davinci *drvdata = | 42 | struct snd_soc_card_drvdata_davinci *drvdata = |
| 43 | snd_soc_card_get_drvdata(soc_card); | 43 | snd_soc_card_get_drvdata(soc_card); |
| 44 | 44 | ||
| @@ -51,7 +51,7 @@ static int evm_startup(struct snd_pcm_substream *substream) | |||
| 51 | static void evm_shutdown(struct snd_pcm_substream *substream) | 51 | static void evm_shutdown(struct snd_pcm_substream *substream) |
| 52 | { | 52 | { |
| 53 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 53 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
| 54 | struct snd_soc_card *soc_card = rtd->codec->card; | 54 | struct snd_soc_card *soc_card = rtd->card; |
| 55 | struct snd_soc_card_drvdata_davinci *drvdata = | 55 | struct snd_soc_card_drvdata_davinci *drvdata = |
| 56 | snd_soc_card_get_drvdata(soc_card); | 56 | snd_soc_card_get_drvdata(soc_card); |
| 57 | 57 | ||
| @@ -65,8 +65,7 @@ static int evm_hw_params(struct snd_pcm_substream *substream, | |||
| 65 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 65 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
| 66 | struct snd_soc_dai *codec_dai = rtd->codec_dai; | 66 | struct snd_soc_dai *codec_dai = rtd->codec_dai; |
| 67 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; | 67 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; |
| 68 | struct snd_soc_codec *codec = rtd->codec; | 68 | struct snd_soc_card *soc_card = rtd->card; |
| 69 | struct snd_soc_card *soc_card = codec->card; | ||
| 70 | int ret = 0; | 69 | int ret = 0; |
| 71 | unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *) | 70 | unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *) |
| 72 | snd_soc_card_get_drvdata(soc_card))->sysclk; | 71 | snd_soc_card_get_drvdata(soc_card))->sysclk; |
| @@ -125,7 +124,7 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd) | |||
| 125 | { | 124 | { |
| 126 | struct snd_soc_card *card = rtd->card; | 125 | struct snd_soc_card *card = rtd->card; |
| 127 | struct snd_soc_codec *codec = rtd->codec; | 126 | struct snd_soc_codec *codec = rtd->codec; |
| 128 | struct device_node *np = codec->card->dev->of_node; | 127 | struct device_node *np = card->dev->of_node; |
| 129 | int ret; | 128 | int ret; |
| 130 | 129 | ||
| 131 | /* Add davinci-evm specific widgets */ | 130 | /* Add davinci-evm specific widgets */ |