aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r--sound/soc/pxa/pxa-ssp.c6
-rw-r--r--sound/soc/pxa/pxa2xx-ac97.c6
-rw-r--r--sound/soc/pxa/pxa2xx-i2s.c6
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
247static int pxa_ssp_suspend(struct platform_device *pdev, 247static 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
260static int pxa_ssp_resume(struct platform_device *pdev, 259static 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
90static int pxa2xx_ac97_suspend(struct platform_device *pdev, 90static 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
96static int pxa2xx_ac97_resume(struct platform_device *pdev, 95static 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
296static int pxa2xx_i2s_suspend(struct platform_device *dev, 296static 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
314static int pxa2xx_i2s_resume(struct platform_device *pdev, 313static 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;