diff options
Diffstat (limited to 'sound/soc/blackfin')
-rw-r--r-- | sound/soc/blackfin/bf5xx-ac97.c | 6 | ||||
-rw-r--r-- | sound/soc/blackfin/bf5xx-i2s.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c index 709bdf08e398..c602ce109d52 100644 --- a/sound/soc/blackfin/bf5xx-ac97.c +++ b/sound/soc/blackfin/bf5xx-ac97.c | |||
@@ -269,8 +269,7 @@ struct snd_ac97_bus_ops soc_ac97_ops = { | |||
269 | EXPORT_SYMBOL_GPL(soc_ac97_ops); | 269 | EXPORT_SYMBOL_GPL(soc_ac97_ops); |
270 | 270 | ||
271 | #ifdef CONFIG_PM | 271 | #ifdef CONFIG_PM |
272 | static int bf5xx_ac97_suspend(struct platform_device *pdev, | 272 | static int bf5xx_ac97_suspend(struct snd_soc_dai *dai) |
273 | struct snd_soc_dai *dai) | ||
274 | { | 273 | { |
275 | struct sport_device *sport = | 274 | struct sport_device *sport = |
276 | (struct sport_device *)dai->private_data; | 275 | (struct sport_device *)dai->private_data; |
@@ -285,8 +284,7 @@ static int bf5xx_ac97_suspend(struct platform_device *pdev, | |||
285 | return 0; | 284 | return 0; |
286 | } | 285 | } |
287 | 286 | ||
288 | static int bf5xx_ac97_resume(struct platform_device *pdev, | 287 | static int bf5xx_ac97_resume(struct snd_soc_dai *dai) |
289 | struct snd_soc_dai *dai) | ||
290 | { | 288 | { |
291 | int ret; | 289 | int ret; |
292 | struct sport_device *sport = | 290 | struct sport_device *sport = |
diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c index 6e5036bf9245..9f8ce87cc6c6 100644 --- a/sound/soc/blackfin/bf5xx-i2s.c +++ b/sound/soc/blackfin/bf5xx-i2s.c | |||
@@ -222,16 +222,14 @@ static int bf5xx_i2s_probe(struct platform_device *pdev, | |||
222 | return 0; | 222 | return 0; |
223 | } | 223 | } |
224 | 224 | ||
225 | static void bf5xx_i2s_remove(struct platform_device *pdev, | 225 | static void bf5xx_i2s_remove(struct snd_soc_dai *dai) |
226 | struct snd_soc_dai *dai) | ||
227 | { | 226 | { |
228 | pr_debug("%s enter\n", __func__); | 227 | pr_debug("%s enter\n", __func__); |
229 | peripheral_free_list(&sport_req[sport_num][0]); | 228 | peripheral_free_list(&sport_req[sport_num][0]); |
230 | } | 229 | } |
231 | 230 | ||
232 | #ifdef CONFIG_PM | 231 | #ifdef CONFIG_PM |
233 | static int bf5xx_i2s_suspend(struct platform_device *dev, | 232 | static int bf5xx_i2s_suspend(struct snd_soc_dai *dai) |
234 | struct snd_soc_dai *dai) | ||
235 | { | 233 | { |
236 | struct sport_device *sport = | 234 | struct sport_device *sport = |
237 | (struct sport_device *)dai->private_data; | 235 | (struct sport_device *)dai->private_data; |