Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2005-01-20 16:16:21 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-20 16:16:21 -0800
commite0ae9de8d2c968db4b1b7f1bff2f812d8e8d1e45 (patch)
treeecc75be7ab31251e8d22e1e24176604db2a32c66
parentbbe9df084798e180c41bde3f5ae5cd4e6b7eff52 (diff)
[PATCH] Lock initializer cleanup: sound
Use the new lock initializers DEFINE_SPIN_LOCK and DEFINE_RW_LOCK Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--sound/oss/emu10k1/midi.c2
-rw-r--r--sound/oss/gus_wave.c2
-rw-r--r--sound/oss/mad16.c2
-rw-r--r--sound/oss/midibuf.c2
-rw-r--r--sound/oss/opl3sa.c2
-rw-r--r--sound/oss/opl3sa2.c2
-rw-r--r--sound/oss/pas2_card.c2
-rw-r--r--sound/oss/pss.c2
-rw-r--r--sound/oss/sb_common.c2
-rw-r--r--sound/oss/sequencer.c2
-rw-r--r--sound/oss/sys_timer.c2
-rw-r--r--sound/oss/uart6850.c2
-rw-r--r--sound/oss/waveartist.c2
-rw-r--r--sound/oss/wavfront.c2
-rw-r--r--sound/oss/wf_midi.c2
-rw-r--r--sound/oss/ymfpci.c2
-rw-r--r--sound/sound_core.c2
17 files changed, 17 insertions, 17 deletions
diff --git a/sound/oss/emu10k1/midi.c b/sound/oss/emu10k1/midi.c
index f0a48f39f2ed..33dea3d56c1e 100644
--- a/sound/oss/emu10k1/midi.c
+++ b/sound/oss/emu10k1/midi.c
@@ -45,7 +45,7 @@
#include "../sound_config.h"
#endif
-static spinlock_t midi_spinlock __attribute((unused)) = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(midi_spinlock __attribute((unused)));
static void init_midi_hdr(struct midi_hdr *midihdr)
{
diff --git a/sound/oss/gus_wave.c b/sound/oss/gus_wave.c
index dfa1cb5871db..b1f5c8c9f69d 100644
--- a/sound/oss/gus_wave.c
+++ b/sound/oss/gus_wave.c
@@ -139,7 +139,7 @@ static int pcm_current_block;
static unsigned long pcm_current_buf;
static int pcm_current_count;
static int pcm_current_intrflag;
-spinlock_t gus_lock=SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(gus_lock);
extern int *gus_osp;
diff --git a/sound/oss/mad16.c b/sound/oss/mad16.c
index 40f6b1e27407..f53970a602ec 100644
--- a/sound/oss/mad16.c
+++ b/sound/oss/mad16.c
@@ -53,7 +53,7 @@
static int mad16_conf;
static int mad16_cdsel;
static struct gameport gameport;
-static spinlock_t lock=SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(lock);
#define C928 1
#define MOZART 2
diff --git a/sound/oss/midibuf.c b/sound/oss/midibuf.c
index 615b5c8c7bf5..b2676fa34630 100644
--- a/sound/oss/midibuf.c
+++ b/sound/oss/midibuf.c
@@ -53,7 +53,7 @@ static void midi_poll(unsigned long dummy);
static struct timer_list poll_timer = TIMER_INITIALIZER(midi_poll, 0, 0);
static volatile int open_devs;
-static spinlock_t lock=SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(lock);
#define DATA_AVAIL(q) (q->len)
#define SPACE_AVAIL(q) (MAX_QUEUE_SIZE - q->len)
diff --git a/sound/oss/opl3sa.c b/sound/oss/opl3sa.c
index b830aa6afdda..fe4907c6e8fc 100644
--- a/sound/oss/opl3sa.c
+++ b/sound/oss/opl3sa.c
@@ -36,7 +36,7 @@
static int sb_initialized;
#endif
-static spinlock_t lock=SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(lock);
static unsigned char opl3sa_read(int addr)
{
diff --git a/sound/oss/opl3sa2.c b/sound/oss/opl3sa2.c
index cfeaebd4883f..cb1019e6e5a8 100644
--- a/sound/oss/opl3sa2.c
+++ b/sound/oss/opl3sa2.c
@@ -832,7 +832,7 @@ static struct pnp_driver opl3sa2_driver = {
/* End of component functions */
#ifdef CONFIG_PM
-static spinlock_t opl3sa2_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(opl3sa2_lock);
/* Power Management support functions */
static int opl3sa2_suspend(struct pm_dev *pdev, unsigned int pm_mode)
diff --git a/sound/oss/pas2_card.c b/sound/oss/pas2_card.c
index cb235fcd4805..c9696dc9fdf9 100644
--- a/sound/oss/pas2_card.c
+++ b/sound/oss/pas2_card.c
@@ -40,7 +40,7 @@ int pas_translate_code = 0;
static int pas_intr_mask;
static int pas_irq;
static int pas_sb_base;
-spinlock_t pas_lock=SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(pas_lock);
#ifndef CONFIG_PAS_JOYSTICK
static int joystick;
#else
diff --git a/sound/oss/pss.c b/sound/oss/pss.c
index 55a8c8cfc39f..c5d2ab0ffa66 100644
--- a/sound/oss/pss.c
+++ b/sound/oss/pss.c
@@ -143,7 +143,7 @@ typedef struct pss_confdata {
static pss_confdata pss_data;
static pss_confdata *devc = &pss_data;
-static spinlock_t lock=SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(lock);
static int pss_initialized;
static int nonstandard_microcode;
diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c
index 092492d131bf..ce359e6c933a 100644
--- a/sound/oss/sb_common.c
+++ b/sound/oss/sb_common.c
@@ -67,7 +67,7 @@ void *smw_free;
static int jazz16_base; /* Not detected */
static unsigned char jazz16_bits; /* I/O relocation bits */
-static spinlock_t jazz16_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(jazz16_lock);
/*
* Logitech Soundman Wave specific initialization code
diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c
index ceb8ca6ae12b..698614226c9a 100644
--- a/sound/oss/sequencer.c
+++ b/sound/oss/sequencer.c
@@ -28,7 +28,7 @@ static int pending_timer = -1; /* For timer change operation */
extern unsigned long seq_time;
static int obsolete_api_used;
-static spinlock_t lock=SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(lock);
/*
* Local counts for number of synth and MIDI devices. These are initialized
diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c
index 3b7fa02cb29b..6afe29b763b7 100644
--- a/sound/oss/sys_timer.c
+++ b/sound/oss/sys_timer.c
@@ -27,7 +27,7 @@ static volatile unsigned long next_event_time;
static unsigned long prev_event_time;
static void poll_def_tmr(unsigned long dummy);
-static spinlock_t lock=SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(lock);
static struct timer_list def_tmr = TIMER_INITIALIZER(poll_def_tmr, 0, 0);
diff --git a/sound/oss/uart6850.c b/sound/oss/uart6850.c
index f051ca0a69b2..be00cf128651 100644
--- a/sound/oss/uart6850.c
+++ b/sound/oss/uart6850.c
@@ -72,7 +72,7 @@ static int uart6850_opened;
static int uart6850_irq;
static int uart6850_detected;
static int my_dev;
-static spinlock_t lock=SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(lock);
static void (*midi_input_intr) (int dev, unsigned char data);
static void poll_uart6850(unsigned long dummy);
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index 438e64ecbd88..99d04ad3ca13 100644
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -146,7 +146,7 @@ typedef struct wavnc_port_info {
static int nr_waveartist_devs;
static wavnc_info adev_info[MAX_AUDIO_DEV];
-static spinlock_t waveartist_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(waveartist_lock);
#ifndef CONFIG_ARCH_NETWINDER
#define machine_is_netwinder() 0
diff --git a/sound/oss/wavfront.c b/sound/oss/wavfront.c
index b72db329d1a6..9057edaaab16 100644
--- a/sound/oss/wavfront.c
+++ b/sound/oss/wavfront.c
@@ -277,7 +277,7 @@ struct wf_config {
wait_queue_head_t interrupt_sleeper;
} dev;
-static spinlock_t lock=SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(lock);
static int detect_wffx(void);
static int wffx_ioctl (wavefront_fx_info *);
static int wffx_init (void);
diff --git a/sound/oss/wf_midi.c b/sound/oss/wf_midi.c
index 3ced960e53d4..7b167b74375b 100644
--- a/sound/oss/wf_midi.c
+++ b/sound/oss/wf_midi.c
@@ -81,7 +81,7 @@ static struct wf_mpu_config *phys_dev = &devs[0];
static struct wf_mpu_config *virt_dev = &devs[1];
static void start_uart_mode (void);
-static spinlock_t lock=SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(lock);
#define OUTPUT_READY 0x40
#define INPUT_AVAIL 0x80
diff --git a/sound/oss/ymfpci.c b/sound/oss/ymfpci.c
index 00f387c8c22f..3bbe819ed3f7 100644
--- a/sound/oss/ymfpci.c
+++ b/sound/oss/ymfpci.c
@@ -99,7 +99,7 @@ static void ymfpci_disable_dsp(ymfpci_t *unit);
static void ymfpci_download_image(ymfpci_t *codec);
static void ymf_memload(ymfpci_t *unit);
-static spinlock_t ymf_devs_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(ymf_devs_lock);
static LIST_HEAD(ymf_devs);
/*
diff --git a/sound/sound_core.c b/sound/sound_core.c
index e8d5b2edcfd8..30f75c9288cb 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -146,7 +146,7 @@ static struct sound_unit *__sound_remove_unit(struct sound_unit **list, int unit
* This lock guards the sound loader list.
*/
-static spinlock_t sound_loader_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(sound_loader_lock);
/*
* Allocate the controlling structure and add it to the sound driver