diff options
Diffstat (limited to 'sound/soc/s3c24xx/s3c24xx_simtec.c')
-rw-r--r-- | sound/soc/s3c24xx/s3c24xx_simtec.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sound/soc/s3c24xx/s3c24xx_simtec.c b/sound/soc/s3c24xx/s3c24xx_simtec.c index 4984754f3298..c4c111442010 100644 --- a/sound/soc/s3c24xx/s3c24xx_simtec.c +++ b/sound/soc/s3c24xx/s3c24xx_simtec.c | |||
@@ -139,8 +139,10 @@ static const struct snd_kcontrol_new amp_unmute_controls[] = { | |||
139 | speaker_unmute_get, speaker_unmute_put), | 139 | speaker_unmute_get, speaker_unmute_put), |
140 | }; | 140 | }; |
141 | 141 | ||
142 | void simtec_audio_init(struct snd_soc_codec *codec) | 142 | void simtec_audio_init(struct snd_soc_pcm_runtime *rtd) |
143 | { | 143 | { |
144 | struct snd_soc_codec *codec = rtd->codec; | ||
145 | |||
144 | if (pdata->amp_gpio > 0) { | 146 | if (pdata->amp_gpio > 0) { |
145 | pr_debug("%s: adding amp routes\n", __func__); | 147 | pr_debug("%s: adding amp routes\n", __func__); |
146 | 148 | ||
@@ -170,8 +172,8 @@ static int simtec_hw_params(struct snd_pcm_substream *substream, | |||
170 | struct snd_pcm_hw_params *params) | 172 | struct snd_pcm_hw_params *params) |
171 | { | 173 | { |
172 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 174 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
173 | struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; | 175 | struct snd_soc_dai *codec_dai = rtd->codec_dai; |
174 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; | 176 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; |
175 | int ret; | 177 | int ret; |
176 | 178 | ||
177 | /* Set the CODEC as the bus clock master, I2S */ | 179 | /* Set the CODEC as the bus clock master, I2S */ |
@@ -319,12 +321,12 @@ EXPORT_SYMBOL_GPL(simtec_audio_pmops); | |||
319 | #endif | 321 | #endif |
320 | 322 | ||
321 | int __devinit simtec_audio_core_probe(struct platform_device *pdev, | 323 | int __devinit simtec_audio_core_probe(struct platform_device *pdev, |
322 | struct snd_soc_device *socdev) | 324 | struct snd_soc_card *card) |
323 | { | 325 | { |
324 | struct platform_device *snd_dev; | 326 | struct platform_device *snd_dev; |
325 | int ret; | 327 | int ret; |
326 | 328 | ||
327 | socdev->card->dai_link->ops = &simtec_snd_ops; | 329 | card->dai_link->ops = &simtec_snd_ops; |
328 | 330 | ||
329 | pdata = pdev->dev.platform_data; | 331 | pdata = pdev->dev.platform_data; |
330 | if (!pdata) { | 332 | if (!pdata) { |
@@ -353,8 +355,7 @@ int __devinit simtec_audio_core_probe(struct platform_device *pdev, | |||
353 | goto err_gpio; | 355 | goto err_gpio; |
354 | } | 356 | } |
355 | 357 | ||
356 | platform_set_drvdata(snd_dev, socdev); | 358 | platform_set_drvdata(snd_dev, card); |
357 | socdev->dev = &snd_dev->dev; | ||
358 | 359 | ||
359 | ret = platform_device_add(snd_dev); | 360 | ret = platform_device_add(snd_dev); |
360 | if (ret) { | 361 | if (ret) { |