vserver 1.9.5.x5

[linux-2.6.git] / sound / oss / emu10k1 / audio.c

diff --git a/sound/oss/emu10k1/audio.c b/sound/oss/emu10k1/audio.c
index 9cf30ab..cde4d59 100644 (file)
--- a/sound/oss/emu10k1/audio.c
+++ b/sound/oss/emu10k1/audio.c
@@ -49,6 +49,9 @@
 static void calculate_ofrag(struct woinst *);
 static void calculate_ifrag(struct wiinst *);
 
+static void emu10k1_waveout_bh(unsigned long refdata);
+static void emu10k1_wavein_bh(unsigned long refdata);
+
 /* Audio file operations */
 static ssize_t emu10k1_audio_read(struct file *file, char __user *buffer, size_t count, loff_t * ppos)
 {
@@ -1032,7 +1035,7 @@ static struct page *emu10k1_mm_nopage (struct vm_area_struct * vma, unsigned lon
        return dmapage;
 }
 
-struct vm_operations_struct emu10k1_mm_ops = {
+static struct vm_operations_struct emu10k1_mm_ops = {
        .nopage         = emu10k1_mm_nopage,
 };
 
@@ -1191,7 +1194,7 @@ match:
                wiinst->mmapped = 0;
                wiinst->total_recorded = 0;
                wiinst->blocks = 0;
-               wiinst->lock = SPIN_LOCK_UNLOCKED;
+               spin_lock_init(&wiinst->lock);
                tasklet_init(&wiinst->timer.tasklet, emu10k1_wavein_bh, (unsigned long) wave_dev);
                wave_dev->wiinst = wiinst;
                emu10k1_wavein_setformat(wave_dev, &wiinst->format);
@@ -1235,7 +1238,7 @@ match:
                woinst->total_copied = 0;
                woinst->total_played = 0;
                woinst->blocks = 0;
-               woinst->lock = SPIN_LOCK_UNLOCKED;
+               spin_lock_init(&woinst->lock);
                tasklet_init(&woinst->timer.tasklet, emu10k1_waveout_bh, (unsigned long) wave_dev);
                wave_dev->woinst = woinst;
                emu10k1_waveout_setformat(wave_dev, &woinst->format);
@@ -1506,7 +1509,7 @@ static void calculate_ifrag(struct wiinst *wiinst)
        return;
 }
 
-void emu10k1_wavein_bh(unsigned long refdata)
+static void emu10k1_wavein_bh(unsigned long refdata)
 {
        struct emu10k1_wavedevice *wave_dev = (struct emu10k1_wavedevice *) refdata;
        struct wiinst *wiinst = wave_dev->wiinst;
@@ -1537,7 +1540,7 @@ void emu10k1_wavein_bh(unsigned long refdata)
        return;
 }
 
-void emu10k1_waveout_bh(unsigned long refdata)
+static void emu10k1_waveout_bh(unsigned long refdata)
 {
        struct emu10k1_wavedevice *wave_dev = (struct emu10k1_wavedevice *) refdata;
        struct woinst *woinst = wave_dev->woinst;