git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
sound
/
arm
/
aaci.c
diff --git
a/sound/arm/aaci.c
b/sound/arm/aaci.c
index
5f22d70
..
149feb4
100644
(file)
--- 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;
if (ac97->num >= 4)
return;
-
mutex_lock
(&aaci->ac97_sem);
+
down
(&aaci->ac97_sem);
aaci_ac97_select_codec(aaci, ac97);
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));
v = readl(aaci->base + AACI_SLFR);
} while (v & (SLFR_1TXB|SLFR_2TXB));
-
mutex_unlock
(&aaci->ac97_sem);
+
up
(&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;
if (ac97->num >= 4)
return ~0;
-
mutex_lock
(&aaci->ac97_sem);
+
down
(&aaci->ac97_sem);
aaci_ac97_select_codec(aaci, ac97);
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;
}
v = ~0;
}
-
mutex_unlock
(&aaci->ac97_sem);
+
up
(&aaci->ac97_sem);
return v;
}
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;
card->shortname, dev->res.start, dev->irq[0]);
aaci = card->private_data;
-
mutex_init
(&aaci->ac97_sem);
+
init_MUTEX
(&aaci->ac97_sem);
spin_lock_init(&aaci->lock);
aaci->card = card;
aaci->dev = dev;
spin_lock_init(&aaci->lock);
aaci->card = card;
aaci->dev = dev;