[PATCH] sem2mutex: sound/oss/
Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
@@ -64,6 +64,8 @@
|
||||
#include <linux/smp_lock.h>
|
||||
#include <linux/ac97_codec.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/mutex.h>
|
||||
|
||||
#include <asm/uaccess.h>
|
||||
|
||||
#ifndef PCI_DEVICE_ID_ALI_5455
|
||||
@@ -234,7 +236,7 @@ struct ali_state {
|
||||
struct ali_card *card; /* Card info */
|
||||
|
||||
/* single open lock mechanism, only used for recording */
|
||||
struct semaphore open_sem;
|
||||
struct mutex open_mutex;
|
||||
wait_queue_head_t open_wait;
|
||||
|
||||
/* file mode */
|
||||
@@ -2807,7 +2809,7 @@ found_virt:
|
||||
state->card = card;
|
||||
state->magic = ALI5455_STATE_MAGIC;
|
||||
init_waitqueue_head(&dmabuf->wait);
|
||||
init_MUTEX(&state->open_sem);
|
||||
mutex_init(&state->open_mutex);
|
||||
file->private_data = state;
|
||||
dmabuf->trigger = 0;
|
||||
/* allocate hardware channels */
|
||||
@@ -3359,7 +3361,7 @@ static void __devinit ali_configure_clocking(void)
|
||||
state->card = card;
|
||||
state->magic = ALI5455_STATE_MAGIC;
|
||||
init_waitqueue_head(&dmabuf->wait);
|
||||
init_MUTEX(&state->open_sem);
|
||||
mutex_init(&state->open_mutex);
|
||||
dmabuf->fmt = ALI5455_FMT_STEREO | ALI5455_FMT_16BIT;
|
||||
dmabuf->trigger = PCM_ENABLE_OUTPUT;
|
||||
ali_set_dac_rate(state, 48000);
|
||||
|
Reference in New Issue
Block a user