Merge branch 'merge-powerpc' of git://git.secretlab.ca/git/linux-2.6

[karo-tx-linux.git] / sound / soc / blackfin / bf5xx-ac97.c

diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c
index 523b7fc33f4e7f94b5d1f6f6ffd89f9e904479c5..c0eba51099804fcebc40ee13d5b495b3106448f2 100644 (file)
--- a/sound/soc/blackfin/bf5xx-ac97.c
+++ b/sound/soc/blackfin/bf5xx-ac97.c
@@ -255,8 +255,7 @@ EXPORT_SYMBOL_GPL(soc_ac97_ops);
 #ifdef CONFIG_PM
 static int bf5xx_ac97_suspend(struct snd_soc_dai *dai)
 {
-       struct sport_device *sport =
-               (struct sport_device *)dai->private_data;
+       struct sport_device *sport = dai->private_data;
 
        pr_debug("%s : sport %d\n", __func__, dai->id);
        if (!dai->active)
@@ -271,8 +270,7 @@ static int bf5xx_ac97_suspend(struct snd_soc_dai *dai)
 static int bf5xx_ac97_resume(struct snd_soc_dai *dai)
 {
        int ret;
-       struct sport_device *sport =
-               (struct sport_device *)dai->private_data;
+       struct sport_device *sport = dai->private_data;
 
        pr_debug("%s : sport %d\n", __func__, dai->id);
        if (!dai->active)