[ALSA] semaphore -> mutex (ISA part)

[karo-tx-linux.git] / sound / isa / sb / sb16_csp.c

diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c
index 9c2b5efbacbf518035e55d2f6895b280cc101766..9703c68e4e0803e5c7fe0259b7ec7cff8d46604b 100644 (file)
--- a/sound/isa/sb/sb16_csp.c
+++ b/sound/isa/sb/sb16_csp.c
@@ -138,7 +138,7 @@ int snd_sb_csp_new(struct snd_sb *chip, int device, struct snd_hwdep ** rhwdep)
        p->ops.csp_stop = snd_sb_csp_stop;
        p->ops.csp_qsound_transfer = snd_sb_csp_qsound_transfer;
 
-       init_MUTEX(&p->access_mutex);
+       mutex_init(&p->access_mutex);
        sprintf(hw->name, "CSP v%d.%d", (version >> 4), (version & 0x0f));
        hw->iface = SNDRV_HWDEP_IFACE_SB16CSP;
        hw->private_data = p;
@@ -265,13 +265,13 @@ static int snd_sb_csp_release(struct snd_hwdep * hw, struct file *file)
  */
 static int snd_sb_csp_use(struct snd_sb_csp * p)
 {
-       down(&p->access_mutex);
+       mutex_lock(&p->access_mutex);
        if (p->used) {
-               up(&p->access_mutex);
+               mutex_unlock(&p->access_mutex);
                return -EAGAIN;
        }
        p->used++;
-       up(&p->access_mutex);
+       mutex_unlock(&p->access_mutex);
 
        return 0;
 
@@ -282,9 +282,9 @@ static int snd_sb_csp_use(struct snd_sb_csp * p)
  */
 static int snd_sb_csp_unuse(struct snd_sb_csp * p)
 {
-       down(&p->access_mutex);
+       mutex_lock(&p->access_mutex);
        p->used--;
-       up(&p->access_mutex);
+       mutex_unlock(&p->access_mutex);
 
        return 0;
 }