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/pxa | |
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/pxa')
-rw-r--r-- | sound/soc/pxa/pxa-ssp.c | 6 | ||||
-rw-r--r-- | sound/soc/pxa/pxa2xx-ac97.c | 6 | ||||
-rw-r--r-- | sound/soc/pxa/pxa2xx-i2s.c | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 402fc5ba65e7..73fa10defcca 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c | |||
@@ -244,8 +244,7 @@ static void pxa_ssp_shutdown(struct snd_pcm_substream *substream, | |||
244 | 244 | ||
245 | #ifdef CONFIG_PM | 245 | #ifdef CONFIG_PM |
246 | 246 | ||
247 | static int pxa_ssp_suspend(struct platform_device *pdev, | 247 | static int pxa_ssp_suspend(struct snd_soc_dai *cpu_dai) |
248 | struct snd_soc_dai *cpu_dai) | ||
249 | { | 248 | { |
250 | struct ssp_priv *priv = cpu_dai->private_data; | 249 | struct ssp_priv *priv = cpu_dai->private_data; |
251 | 250 | ||
@@ -257,8 +256,7 @@ static int pxa_ssp_suspend(struct platform_device *pdev, | |||
257 | return 0; | 256 | return 0; |
258 | } | 257 | } |
259 | 258 | ||
260 | static int pxa_ssp_resume(struct platform_device *pdev, | 259 | static int pxa_ssp_resume(struct snd_soc_dai *cpu_dai) |
261 | struct snd_soc_dai *cpu_dai) | ||
262 | { | 260 | { |
263 | struct ssp_priv *priv = cpu_dai->private_data; | 261 | struct ssp_priv *priv = cpu_dai->private_data; |
264 | 262 | ||
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index bffbe288634c..8eed80d5675d 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c | |||
@@ -87,14 +87,12 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_mic_mono_in = { | |||
87 | }; | 87 | }; |
88 | 88 | ||
89 | #ifdef CONFIG_PM | 89 | #ifdef CONFIG_PM |
90 | static int pxa2xx_ac97_suspend(struct platform_device *pdev, | 90 | static int pxa2xx_ac97_suspend(struct snd_soc_dai *dai) |
91 | struct snd_soc_dai *dai) | ||
92 | { | 91 | { |
93 | return pxa2xx_ac97_hw_suspend(); | 92 | return pxa2xx_ac97_hw_suspend(); |
94 | } | 93 | } |
95 | 94 | ||
96 | static int pxa2xx_ac97_resume(struct platform_device *pdev, | 95 | static int pxa2xx_ac97_resume(struct snd_soc_dai *dai) |
97 | struct snd_soc_dai *dai) | ||
98 | { | 96 | { |
99 | return pxa2xx_ac97_hw_resume(); | 97 | return pxa2xx_ac97_hw_resume(); |
100 | } | 98 | } |
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index f9a9e2ebafa1..314973ace6dc 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c | |||
@@ -293,8 +293,7 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream, | |||
293 | } | 293 | } |
294 | 294 | ||
295 | #ifdef CONFIG_PM | 295 | #ifdef CONFIG_PM |
296 | static int pxa2xx_i2s_suspend(struct platform_device *dev, | 296 | static int pxa2xx_i2s_suspend(struct snd_soc_dai *dai) |
297 | struct snd_soc_dai *dai) | ||
298 | { | 297 | { |
299 | if (!dai->active) | 298 | if (!dai->active) |
300 | return 0; | 299 | return 0; |
@@ -311,8 +310,7 @@ static int pxa2xx_i2s_suspend(struct platform_device *dev, | |||
311 | return 0; | 310 | return 0; |
312 | } | 311 | } |
313 | 312 | ||
314 | static int pxa2xx_i2s_resume(struct platform_device *pdev, | 313 | static int pxa2xx_i2s_resume(struct snd_soc_dai *dai) |
315 | struct snd_soc_dai *dai) | ||
316 | { | 314 | { |
317 | if (!dai->active) | 315 | if (!dai->active) |
318 | return 0; | 316 | return 0; |