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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
arm
/
pxa2xx-ac97.c
diff --git
a/sound/arm/pxa2xx-ac97.c
b/sound/arm/pxa2xx-ac97.c
index
3acbc60
..
dede954
100644
(file)
--- a/
sound/arm/pxa2xx-ac97.c
+++ b/
sound/arm/pxa2xx-ac97.c
@@
-25,7
+25,7
@@
#include <sound/initval.h>
#include <asm/irq.h>
#include <sound/initval.h>
#include <asm/irq.h>
-#include <
asm/semaphore
.h>
+#include <
linux/mutex
.h>
#include <asm/hardware.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/audio.h>
#include <asm/hardware.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/audio.h>
@@
-33,7
+33,7
@@
#include "pxa2xx-pcm.h"
#include "pxa2xx-pcm.h"
-static DE
CLAR
E_MUTEX(car_mutex);
+static DE
FIN
E_MUTEX(car_mutex);
static DECLARE_WAIT_QUEUE_HEAD(gsr_wq);
static volatile long gsr_bits;
static DECLARE_WAIT_QUEUE_HEAD(gsr_wq);
static volatile long gsr_bits;
@@
-52,7
+52,7
@@
static unsigned short pxa2xx_ac97_read(struct snd_ac97 *ac97, unsigned short reg
unsigned short val = -1;
volatile u32 *reg_addr;
unsigned short val = -1;
volatile u32 *reg_addr;
-
down
(&car_mutex);
+
mutex_lock
(&car_mutex);
/* set up primary or secondary codec space */
reg_addr = (ac97->num & 1) ? &SAC_REG_BASE : &PAC_REG_BASE;
/* set up primary or secondary codec space */
reg_addr = (ac97->num & 1) ? &SAC_REG_BASE : &PAC_REG_BASE;
@@
-79,7
+79,7
@@
static unsigned short pxa2xx_ac97_read(struct snd_ac97 *ac97, unsigned short reg
/* but we've just started another cycle... */
wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_SDONE, 1);
/* but we've just started another cycle... */
wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_SDONE, 1);
-out:
up
(&car_mutex);
+out:
mutex_unlock
(&car_mutex);
return val;
}
return val;
}
@@
-87,7
+87,7
@@
static void pxa2xx_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigne
{
volatile u32 *reg_addr;
{
volatile u32 *reg_addr;
-
down
(&car_mutex);
+
mutex_lock
(&car_mutex);
/* set up primary or secondary codec space */
reg_addr = (ac97->num & 1) ? &SAC_REG_BASE : &PAC_REG_BASE;
/* set up primary or secondary codec space */
reg_addr = (ac97->num & 1) ? &SAC_REG_BASE : &PAC_REG_BASE;
@@
-101,7
+101,7
@@
static void pxa2xx_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigne
printk(KERN_ERR "%s: write error (ac97_reg=%d GSR=%#lx)\n",
__FUNCTION__, reg, GSR | gsr_bits);
printk(KERN_ERR "%s: write error (ac97_reg=%d GSR=%#lx)\n",
__FUNCTION__, reg, GSR | gsr_bits);
-
up
(&car_mutex);
+
mutex_unlock
(&car_mutex);
}
static void pxa2xx_ac97_reset(struct snd_ac97 *ac97)
}
static void pxa2xx_ac97_reset(struct snd_ac97 *ac97)
@@
-152,7
+152,7
@@
static void pxa2xx_ac97_reset(struct snd_ac97 *ac97)
GCR |= GCR_SDONE_IE|GCR_CDONE_IE;
}
GCR |= GCR_SDONE_IE|GCR_CDONE_IE;
}
-static irqreturn_t pxa2xx_ac97_irq(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t pxa2xx_ac97_irq(int irq, void *dev_id)
{
long status;
{
long status;