diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-03 13:21:52 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-03 14:19:10 -0500 |
commit | dc7d7b830ee1f4111696e73d1c25da683b461548 (patch) | |
tree | 4b15c46c97756605dcf9baa3b2de2e1af2570264 /sound/soc/au1x | |
parent | 07c84d0409f3551b79d676630d8ee76bb551598d (diff) |
ASoC: Remove platform device from DAI suspend and resume operations
None of the DAIs use it except s3c2412-i2s which only uses it for
dev_() printouts.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/au1x')
-rw-r--r-- | sound/soc/au1x/psc-ac97.c | 6 | ||||
-rw-r--r-- | sound/soc/au1x/psc-i2s.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c index a0bcfeaf5f86..a1e824d29cf9 100644 --- a/sound/soc/au1x/psc-ac97.c +++ b/sound/soc/au1x/psc-ac97.c | |||
@@ -314,8 +314,7 @@ static void au1xpsc_ac97_remove(struct platform_device *pdev, | |||
314 | au1xpsc_ac97_workdata = NULL; | 314 | au1xpsc_ac97_workdata = NULL; |
315 | } | 315 | } |
316 | 316 | ||
317 | static int au1xpsc_ac97_suspend(struct platform_device *pdev, | 317 | static int au1xpsc_ac97_suspend(struct snd_soc_dai *dai) |
318 | struct snd_soc_dai *dai) | ||
319 | { | 318 | { |
320 | /* save interesting registers and disable PSC */ | 319 | /* save interesting registers and disable PSC */ |
321 | au1xpsc_ac97_workdata->pm[0] = | 320 | au1xpsc_ac97_workdata->pm[0] = |
@@ -329,8 +328,7 @@ static int au1xpsc_ac97_suspend(struct platform_device *pdev, | |||
329 | return 0; | 328 | return 0; |
330 | } | 329 | } |
331 | 330 | ||
332 | static int au1xpsc_ac97_resume(struct platform_device *pdev, | 331 | static int au1xpsc_ac97_resume(struct snd_soc_dai *dai) |
333 | struct snd_soc_dai *dai) | ||
334 | { | 332 | { |
335 | /* restore PSC clock config */ | 333 | /* restore PSC clock config */ |
336 | au_writel(au1xpsc_ac97_workdata->pm[0] | PSC_SEL_PS_AC97MODE, | 334 | au_writel(au1xpsc_ac97_workdata->pm[0] | PSC_SEL_PS_AC97MODE, |
diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c index f4217e70a787..16f97462ea15 100644 --- a/sound/soc/au1x/psc-i2s.c +++ b/sound/soc/au1x/psc-i2s.c | |||
@@ -339,8 +339,7 @@ static void au1xpsc_i2s_remove(struct platform_device *pdev, | |||
339 | au1xpsc_i2s_workdata = NULL; | 339 | au1xpsc_i2s_workdata = NULL; |
340 | } | 340 | } |
341 | 341 | ||
342 | static int au1xpsc_i2s_suspend(struct platform_device *pdev, | 342 | static int au1xpsc_i2s_suspend(struct snd_soc_dai *cpu_dai) |
343 | struct snd_soc_dai *cpu_dai) | ||
344 | { | 343 | { |
345 | /* save interesting register and disable PSC */ | 344 | /* save interesting register and disable PSC */ |
346 | au1xpsc_i2s_workdata->pm[0] = | 345 | au1xpsc_i2s_workdata->pm[0] = |
@@ -354,8 +353,7 @@ static int au1xpsc_i2s_suspend(struct platform_device *pdev, | |||
354 | return 0; | 353 | return 0; |
355 | } | 354 | } |
356 | 355 | ||
357 | static int au1xpsc_i2s_resume(struct platform_device *pdev, | 356 | static int au1xpsc_i2s_resume(struct snd_soc_dai *cpu_dai) |
358 | struct snd_soc_dai *cpu_dai) | ||
359 | { | 357 | { |
360 | /* select I2S mode and PSC clock */ | 358 | /* select I2S mode and PSC clock */ |
361 | au_writel(PSC_CTRL_DISABLE, PSC_CTRL(au1xpsc_i2s_workdata)); | 359 | au_writel(PSC_CTRL_DISABLE, PSC_CTRL(au1xpsc_i2s_workdata)); |