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

[ALSA] semaphore -> mutex (driver 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: 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 1a60d4c5

include/sound/emux_synth.h

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ struct snd_emux { 
	struct snd_emux_voice *voices;	/* Voices (EMU 'channel') */

	int use_time;	/* allocation counter */

	spinlock_t voice_lock;	/* Lock for voice access */

	struct semaphore register_mutex;

	struct mutex register_mutex;

	int client;		/* For the sequencer client */

	int ports[SNDRV_EMUX_MAX_PORTS];	/* The ports for this device */

	struct snd_emux_port *portptrs[SNDRV_EMUX_MAX_PORTS];

include/sound/i2c.h

+5 −5
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct snd_i2c_bus { 
	struct snd_card *card;	/* card which I2C belongs to */

	char name[32];		/* some useful label */



	struct semaphore lock_mutex;

	struct mutex lock_mutex;



	struct snd_i2c_bus *master;	/* master bus when SCK/SCL is shared */

	struct list_head buses;	/* master: slave buses sharing SCK/SCL, slave: link list */
@@ -84,17 +84,17 @@ int snd_i2c_device_free(struct snd_i2c_device *device); 
static inline void snd_i2c_lock(struct snd_i2c_bus *bus)

{

	if (bus->master)

		down(&bus->master->lock_mutex);

		mutex_lock(&bus->master->lock_mutex);

	else

		down(&bus->lock_mutex);

		mutex_lock(&bus->lock_mutex);

}



static inline void snd_i2c_unlock(struct snd_i2c_bus *bus)

{

	if (bus->master)

		up(&bus->master->lock_mutex);

		mutex_unlock(&bus->master->lock_mutex);

	else

		up(&bus->lock_mutex);

		mutex_unlock(&bus->lock_mutex);

}



int snd_i2c_sendbytes(struct snd_i2c_device *device, unsigned char *bytes, int count);

include/sound/opl3.h

+2 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 


#include "driver.h"

#include <linux/time.h>

#include <linux/mutex.h>

#include "core.h"

#include "hwdep.h"

#include "timer.h"
@@ -312,7 +313,7 @@ struct snd_opl3 { 
	int sys_timer_status;		/* system timer run status */

	spinlock_t sys_timer_lock;	/* Lock for system timer access */

#endif

	struct semaphore access_mutex;	/* locking */

	struct mutex access_mutex;	/* locking */

};



/* opl3.c */

include/sound/soundfont.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ struct snd_sf_list { 
	int sample_locked;	/* locked time for sample */

	struct snd_sf_callback callback;	/* callback functions */

	int presets_locked;

	struct semaphore presets_mutex;

	struct mutex presets_mutex;

	spinlock_t lock;

	struct snd_util_memhdr *memhdr;

};

include/sound/util_mem.h

+3 −1
Original line number Diff line number Diff line 
#ifndef __SOUND_UTIL_MEM_H

#define __SOUND_UTIL_MEM_H



#include <linux/mutex.h>

/*

 *  Copyright (C) 2000 Takashi Iwai <tiwai@suse.de>

 *
@@ -40,7 +42,7 @@ struct snd_util_memhdr { 
	int nblocks;			/* # of allocated blocks */

	unsigned int used;		/* used memory size */

	int block_extra_size;		/* extra data size of chunk */

	struct semaphore block_mutex;	/* lock */

	struct mutex block_mutex;	/* lock */

};



/*