Commit 12aa7579 authored by Ingo Molnar's avatar Ingo Molnar Committed by Jaroslav Kysela
Browse files

[ALSA] semaphore -> mutex (Archs, misc buses) 



Semaphore to mutex conversion.

The conversion was generated via scripts, and the result was validated
automatically via a script as well.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 62932df8

sound/arm/aaci.c

+5 −5
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static void aaci_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned 
	if (ac97->num >= 4)

		return;



	down(&aaci->ac97_sem);

	mutex_lock(&aaci->ac97_sem);



	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));



	up(&aaci->ac97_sem);

	mutex_unlock(&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;



	down(&aaci->ac97_sem);

	mutex_lock(&aaci->ac97_sem);



	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;

	}



	up(&aaci->ac97_sem);

	mutex_unlock(&aaci->ac97_sem);

	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;

	init_MUTEX(&aaci->ac97_sem);

	mutex_init(&aaci->ac97_sem);

	spin_lock_init(&aaci->lock);

	aaci->card = card;

	aaci->dev = dev;

sound/arm/aaci.h

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ struct aaci { 
	unsigned int		fifosize;



	/* AC'97 */

	struct semaphore	ac97_sem;

	struct mutex		ac97_sem;

	ac97_bus_t		*ac97_bus;



	u32			maincr;

sound/arm/pxa2xx-ac97.c

+6 −6
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#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>
@@ -33,7 +33,7 @@ 
#include "pxa2xx-pcm.h"





static DECLARE_MUTEX(car_mutex);

static DEFINE_MUTEX(car_mutex);

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;



	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;
@@ -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);



out:	up(&car_mutex);

out:	mutex_unlock(&car_mutex);

	return val;

}
@@ -87,7 +87,7 @@ static void pxa2xx_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigne 
{

	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;
@@ -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);



	up(&car_mutex);

	mutex_unlock(&car_mutex);

}



static void pxa2xx_ac97_reset(struct snd_ac97 *ac97)

sound/pcmcia/vx/vxp_mixer.c

+6 −6
Original line number Diff line number Diff line
@@ -52,14 +52,14 @@ static int vx_mic_level_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v 
{

	struct vx_core *_chip = snd_kcontrol_chip(kcontrol);

	struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip;

	down(&_chip->mixer_mutex);

	mutex_lock(&_chip->mixer_mutex);

	if (chip->mic_level != ucontrol->value.integer.value[0]) {

		vx_set_mic_level(_chip, ucontrol->value.integer.value[0]);

		chip->mic_level = ucontrol->value.integer.value[0];

		up(&_chip->mixer_mutex);

		mutex_unlock(&_chip->mixer_mutex);

		return 1;

	}

	up(&_chip->mixer_mutex);

	mutex_unlock(&_chip->mixer_mutex);

	return 0;

}
@@ -95,14 +95,14 @@ static int vx_mic_boost_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v 
{

	struct vx_core *_chip = snd_kcontrol_chip(kcontrol);

	struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip;

	down(&_chip->mixer_mutex);

	mutex_lock(&_chip->mixer_mutex);

	if (chip->mic_level != ucontrol->value.integer.value[0]) {

		vx_set_mic_boost(_chip, ucontrol->value.integer.value[0]);

		chip->mic_level = ucontrol->value.integer.value[0];

		up(&_chip->mixer_mutex);

		mutex_unlock(&_chip->mixer_mutex);

		return 1;

	}

	up(&_chip->mixer_mutex);

	mutex_unlock(&_chip->mixer_mutex);

	return 0;

}

sound/sparc/cs4231.c

+17 −17
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ struct snd_cs4231 { 
	unsigned char		image[32];	/* registers image */

	int			mce_bit;

	int			calibrate_mute;

	struct semaphore	mce_mutex;

	struct semaphore	open_mutex;

	struct mutex		mce_mutex;

	struct mutex		open_mutex;



	union {

#ifdef SBUS_SUPPORT
@@ -775,7 +775,7 @@ static void snd_cs4231_playback_format(struct snd_cs4231 *chip, struct snd_pcm_h 
{

	unsigned long flags;



	down(&chip->mce_mutex);

	mutex_lock(&chip->mce_mutex);

	snd_cs4231_calibrate_mute(chip, 1);



	snd_cs4231_mce_up(chip);
@@ -790,7 +790,7 @@ static void snd_cs4231_playback_format(struct snd_cs4231 *chip, struct snd_pcm_h 
	snd_cs4231_mce_down(chip);



	snd_cs4231_calibrate_mute(chip, 0);

	up(&chip->mce_mutex);

	mutex_unlock(&chip->mce_mutex);

}



static void snd_cs4231_capture_format(struct snd_cs4231 *chip, struct snd_pcm_hw_params *params,
@@ -798,7 +798,7 @@ static void snd_cs4231_capture_format(struct snd_cs4231 *chip, struct snd_pcm_hw 
{

	unsigned long flags;



	down(&chip->mce_mutex);

	mutex_lock(&chip->mce_mutex);

	snd_cs4231_calibrate_mute(chip, 1);



	snd_cs4231_mce_up(chip);
@@ -819,7 +819,7 @@ static void snd_cs4231_capture_format(struct snd_cs4231 *chip, struct snd_pcm_hw 
	snd_cs4231_mce_down(chip);



	snd_cs4231_calibrate_mute(chip, 0);

	up(&chip->mce_mutex);

	mutex_unlock(&chip->mce_mutex);

}



/*
@@ -933,14 +933,14 @@ static int snd_cs4231_open(struct snd_cs4231 *chip, unsigned int mode) 
{

	unsigned long flags;



	down(&chip->open_mutex);

	mutex_lock(&chip->open_mutex);

	if ((chip->mode & mode)) {

		up(&chip->open_mutex);

		mutex_unlock(&chip->open_mutex);

		return -EAGAIN;

	}

	if (chip->mode & CS4231_MODE_OPEN) {

		chip->mode |= mode;

		up(&chip->open_mutex);

		mutex_unlock(&chip->open_mutex);

		return 0;

	}

	/* ok. now enable and ack CODEC IRQ */
@@ -960,7 +960,7 @@ static int snd_cs4231_open(struct snd_cs4231 *chip, unsigned int mode) 
	spin_unlock_irqrestore(&chip->lock, flags);



	chip->mode = mode;

	up(&chip->open_mutex);

	mutex_unlock(&chip->open_mutex);

	return 0;

}
@@ -968,10 +968,10 @@ static void snd_cs4231_close(struct snd_cs4231 *chip, unsigned int mode) 
{

	unsigned long flags;



	down(&chip->open_mutex);

	mutex_lock(&chip->open_mutex);

	chip->mode &= ~mode;

	if (chip->mode & CS4231_MODE_OPEN) {

		up(&chip->open_mutex);

		mutex_unlock(&chip->open_mutex);

		return;

	}

	snd_cs4231_calibrate_mute(chip, 1);
@@ -1008,7 +1008,7 @@ static void snd_cs4231_close(struct snd_cs4231 *chip, unsigned int mode) 
	snd_cs4231_calibrate_mute(chip, 0);



	chip->mode = 0;

	up(&chip->open_mutex);

	mutex_unlock(&chip->open_mutex);

}



/*
@@ -1969,8 +1969,8 @@ static int __init snd_cs4231_sbus_create(struct snd_card *card, 
	spin_lock_init(&chip->lock);

	spin_lock_init(&chip->c_dma.sbus_info.lock);

	spin_lock_init(&chip->p_dma.sbus_info.lock);

	init_MUTEX(&chip->mce_mutex);

	init_MUTEX(&chip->open_mutex);

	mutex_init(&chip->mce_mutex);

	mutex_init(&chip->open_mutex);

	chip->card = card;

	chip->dev_u.sdev = sdev;

	chip->regs_size = sdev->reg_addrs[0].reg_size;
@@ -2157,8 +2157,8 @@ static int __init snd_cs4231_ebus_create(struct snd_card *card, 
	spin_lock_init(&chip->lock);

	spin_lock_init(&chip->c_dma.ebus_info.lock);

	spin_lock_init(&chip->p_dma.ebus_info.lock);

	init_MUTEX(&chip->mce_mutex);

	init_MUTEX(&chip->open_mutex);

	mutex_init(&chip->mce_mutex);

	mutex_init(&chip->open_mutex);

	chip->flags |= CS4231_FLAG_EBUS;

	chip->card = card;

	chip->dev_u.pdev = edev->bus->self;