[ALSA] semaphore -> mutex (PCI part)
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: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
committed by
Jaroslav Kysela
parent
8b7547f95c
commit
62932df8fb
@@ -27,6 +27,7 @@
|
||||
#include <linux/pci.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/moduleparam.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <sound/core.h>
|
||||
#include <sound/pcm.h>
|
||||
#include <sound/pcm_params.h>
|
||||
@@ -255,7 +256,7 @@ struct atiixp_modem {
|
||||
unsigned int codec_not_ready_bits; /* for codec detection */
|
||||
|
||||
int spdif_over_aclink; /* passed from the module option */
|
||||
struct semaphore open_mutex; /* playback open mutex */
|
||||
struct mutex open_mutex; /* playback open mutex */
|
||||
};
|
||||
|
||||
|
||||
@@ -911,9 +912,9 @@ static int snd_atiixp_playback_open(struct snd_pcm_substream *substream)
|
||||
struct atiixp_modem *chip = snd_pcm_substream_chip(substream);
|
||||
int err;
|
||||
|
||||
down(&chip->open_mutex);
|
||||
mutex_lock(&chip->open_mutex);
|
||||
err = snd_atiixp_pcm_open(substream, &chip->dmas[ATI_DMA_PLAYBACK], 0);
|
||||
up(&chip->open_mutex);
|
||||
mutex_unlock(&chip->open_mutex);
|
||||
if (err < 0)
|
||||
return err;
|
||||
return 0;
|
||||
@@ -923,9 +924,9 @@ static int snd_atiixp_playback_close(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct atiixp_modem *chip = snd_pcm_substream_chip(substream);
|
||||
int err;
|
||||
down(&chip->open_mutex);
|
||||
mutex_lock(&chip->open_mutex);
|
||||
err = snd_atiixp_pcm_close(substream, &chip->dmas[ATI_DMA_PLAYBACK]);
|
||||
up(&chip->open_mutex);
|
||||
mutex_unlock(&chip->open_mutex);
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -1233,7 +1234,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
|
||||
}
|
||||
|
||||
spin_lock_init(&chip->reg_lock);
|
||||
init_MUTEX(&chip->open_mutex);
|
||||
mutex_init(&chip->open_mutex);
|
||||
chip->card = card;
|
||||
chip->pci = pci;
|
||||
chip->irq = -1;
|
||||
|
Reference in New Issue
Block a user