aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/davinci/davinci-i2s.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/davinci/davinci-i2s.c')
-rw-r--r--sound/soc/davinci/davinci-i2s.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index 11c20d0b7bcc..95df51e803b4 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -375,8 +375,8 @@ static int davinci_i2s_probe(struct platform_device *pdev,
375 struct snd_soc_dai *dai) 375 struct snd_soc_dai *dai)
376{ 376{
377 struct snd_soc_device *socdev = platform_get_drvdata(pdev); 377 struct snd_soc_device *socdev = platform_get_drvdata(pdev);
378 struct snd_soc_machine *machine = socdev->machine; 378 struct snd_soc_card *card = socdev->card;
379 struct snd_soc_dai *cpu_dai = machine->dai_link[pdev->id].cpu_dai; 379 struct snd_soc_dai *cpu_dai = card->dai_link[pdev->id].cpu_dai;
380 struct davinci_mcbsp_dev *dev; 380 struct davinci_mcbsp_dev *dev;
381 struct resource *mem, *ioarea; 381 struct resource *mem, *ioarea;
382 struct evm_snd_platform_data *pdata; 382 struct evm_snd_platform_data *pdata;
@@ -437,8 +437,8 @@ static void davinci_i2s_remove(struct platform_device *pdev,
437 struct snd_soc_dai *dai) 437 struct snd_soc_dai *dai)
438{ 438{
439 struct snd_soc_device *socdev = platform_get_drvdata(pdev); 439 struct snd_soc_device *socdev = platform_get_drvdata(pdev);
440 struct snd_soc_machine *machine = socdev->machine; 440 struct snd_soc_card *card = socdev->card;
441 struct snd_soc_dai *cpu_dai = machine->dai_link[pdev->id].cpu_dai; 441 struct snd_soc_dai *cpu_dai = card->dai_link[pdev->id].cpu_dai;
442 struct davinci_mcbsp_dev *dev = cpu_dai->private_data; 442 struct davinci_mcbsp_dev *dev = cpu_dai->private_data;
443 struct resource *mem; 443 struct resource *mem;
444 444