Merge branch 'linus'

1 files changed, 5 insertions, 5 deletions

diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 149feb410654..5f22d70fefc0 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -73,7 +73,7 @@ static void aaci_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned
         if (ac97->num >= 4)
                 return;
 
-        down(&aaci->ac97_sem);
+        mutex_lock(&aaci->ac97_sem);
 
         aaci_ac97_select_codec(aaci, ac97);
 
@@ -91,7 +91,7 @@ static void aaci_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned
                 v = readl(aaci->base + AACI_SLFR);
         } while (v & (SLFR_1TXB|SLFR_2TXB));
 
-        up(&aaci->ac97_sem);
+        mutex_unlock(&aaci->ac97_sem);
 }
 
 /*
@@ -105,7 +105,7 @@ static unsigned short aaci_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
         if (ac97->num >= 4)
                 return ~0;
 
-        down(&aaci->ac97_sem);
+        mutex_lock(&aaci->ac97_sem);
 
         aaci_ac97_select_codec(aaci, ac97);
 
@@ -145,7 +145,7 @@ static unsigned short aaci_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
                 v = ~0;
         }
 
-        up(&aaci->ac97_sem);
+        mutex_unlock(&aaci->ac97_sem);
         return v;
 }
 
@@ -783,7 +783,7 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev)
                  card->shortname, dev->res.start, dev->irq[0]);
 
         aaci = card->private_data;
-        init_MUTEX(&aaci->ac97_sem);
+        mutex_init(&aaci->ac97_sem);
         spin_lock_init(&aaci->lock);
         aaci->card = card;
         aaci->dev = dev;