Commit 1e8fff3a authored by Jaroslav Kysela's avatar Jaroslav Kysela

[ALSA] Use DEFINE_SPINLOCK(), DEFINE_RWLOCK() macros

ALSA Core,PCM Midlevel,Timer Midlevel,ALSA sequencer
ALSA<-OSS sequencer
Replace spin/rwlock definitions with DEFINE_SPINLOCK() and DEFINE_RWLOCK()
macros.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8a9cc563
...@@ -39,7 +39,7 @@ struct snd_shutdown_f_ops { ...@@ -39,7 +39,7 @@ struct snd_shutdown_f_ops {
unsigned int snd_cards_lock = 0; /* locked for registering/using */ unsigned int snd_cards_lock = 0; /* locked for registering/using */
snd_card_t *snd_cards[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = NULL}; snd_card_t *snd_cards[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = NULL};
rwlock_t snd_card_rwlock = RW_LOCK_UNLOCKED; DEFINE_RWLOCK(snd_card_rwlock);
#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE) #if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
int (*snd_mixer_oss_notify_callback)(snd_card_t *card, int free_flag); int (*snd_mixer_oss_notify_callback)(snd_card_t *card, int free_flag);
......
...@@ -50,8 +50,8 @@ static long snd_alloc_kmalloc; ...@@ -50,8 +50,8 @@ static long snd_alloc_kmalloc;
static long snd_alloc_vmalloc; static long snd_alloc_vmalloc;
static LIST_HEAD(snd_alloc_kmalloc_list); static LIST_HEAD(snd_alloc_kmalloc_list);
static LIST_HEAD(snd_alloc_vmalloc_list); static LIST_HEAD(snd_alloc_vmalloc_list);
static spinlock_t snd_alloc_kmalloc_lock = SPIN_LOCK_UNLOCKED; static DEFINE_SPINLOCK(snd_alloc_kmalloc_lock);
static spinlock_t snd_alloc_vmalloc_lock = SPIN_LOCK_UNLOCKED; static DEFINE_SPINLOCK(snd_alloc_vmalloc_lock);
#define KMALLOC_MAGIC 0x87654321 #define KMALLOC_MAGIC 0x87654321
#define VMALLOC_MAGIC 0x87654320 #define VMALLOC_MAGIC 0x87654320
static snd_info_entry_t *snd_memory_info_entry; static snd_info_entry_t *snd_memory_info_entry;
......
...@@ -65,7 +65,7 @@ static int snd_pcm_hw_params_old_user(snd_pcm_substream_t * substream, struct sn ...@@ -65,7 +65,7 @@ static int snd_pcm_hw_params_old_user(snd_pcm_substream_t * substream, struct sn
* *
*/ */
rwlock_t snd_pcm_link_rwlock = RW_LOCK_UNLOCKED; DEFINE_RWLOCK(snd_pcm_link_rwlock);
static DECLARE_RWSEM(snd_pcm_link_rwsem); static DECLARE_RWSEM(snd_pcm_link_rwsem);
......
...@@ -56,7 +56,7 @@ struct seq_oss_midi_t { ...@@ -56,7 +56,7 @@ struct seq_oss_midi_t {
static int max_midi_devs; static int max_midi_devs;
static seq_oss_midi_t *midi_devs[SNDRV_SEQ_OSS_MAX_MIDI_DEVS]; static seq_oss_midi_t *midi_devs[SNDRV_SEQ_OSS_MAX_MIDI_DEVS];
static spinlock_t register_lock = SPIN_LOCK_UNLOCKED; static DEFINE_SPINLOCK(register_lock);
/* /*
* prototypes * prototypes
......
...@@ -75,7 +75,7 @@ static seq_oss_synth_t midi_synth_dev = { ...@@ -75,7 +75,7 @@ static seq_oss_synth_t midi_synth_dev = {
"MIDI", /* name */ "MIDI", /* name */
}; };
static spinlock_t register_lock = SPIN_LOCK_UNLOCKED; static DEFINE_SPINLOCK(register_lock);
/* /*
* prototypes * prototypes
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#define SNDRV_SEQ_LFLG_OUTPUT 0x0002 #define SNDRV_SEQ_LFLG_OUTPUT 0x0002
#define SNDRV_SEQ_LFLG_OPEN (SNDRV_SEQ_LFLG_INPUT|SNDRV_SEQ_LFLG_OUTPUT) #define SNDRV_SEQ_LFLG_OPEN (SNDRV_SEQ_LFLG_INPUT|SNDRV_SEQ_LFLG_OUTPUT)
static spinlock_t clients_lock = SPIN_LOCK_UNLOCKED; static DEFINE_SPINLOCK(clients_lock);
static DECLARE_MUTEX(register_mutex); static DECLARE_MUTEX(register_mutex);
/* /*
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
/* list of allocated queues */ /* list of allocated queues */
static queue_t *queue_list[SNDRV_SEQ_MAX_QUEUES]; static queue_t *queue_list[SNDRV_SEQ_MAX_QUEUES];
static spinlock_t queue_list_lock = SPIN_LOCK_UNLOCKED; static DEFINE_SPINLOCK(queue_list_lock);
/* number of queues allocated */ /* number of queues allocated */
static int num_queues; static int num_queues;
......
...@@ -76,7 +76,7 @@ static LIST_HEAD(snd_timer_list); ...@@ -76,7 +76,7 @@ static LIST_HEAD(snd_timer_list);
static LIST_HEAD(snd_timer_slave_list); static LIST_HEAD(snd_timer_slave_list);
/* lock for slave active lists */ /* lock for slave active lists */
static spinlock_t slave_active_lock = SPIN_LOCK_UNLOCKED; static DEFINE_SPINLOCK(slave_active_lock);
static DECLARE_MUTEX(register_mutex); static DECLARE_MUTEX(register_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment