linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / drivers / opl4 / opl4_lib.c

diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c
index 01997f2..ddfc10d 100644 (file)
--- a/sound/drivers/opl4/opl4_lib.c
+++ b/sound/drivers/opl4/opl4_lib.c
@@ -43,8 +43,6 @@ void snd_opl4_write(struct snd_opl4 *opl4, u8 reg, u8 value)
        outb(value, opl4->pcm_port + 1);
 }
 
-EXPORT_SYMBOL(snd_opl4_write);
-
 u8 snd_opl4_read(struct snd_opl4 *opl4, u8 reg)
 {
        snd_opl4_wait(opl4);
@@ -54,8 +52,6 @@ u8 snd_opl4_read(struct snd_opl4 *opl4, u8 reg)
        return inb(opl4->pcm_port + 1);
 }
 
-EXPORT_SYMBOL(snd_opl4_read);
-
 void snd_opl4_read_memory(struct snd_opl4 *opl4, char *buf, int offset, int size)
 {
        unsigned long flags;
@@ -80,8 +76,6 @@ void snd_opl4_read_memory(struct snd_opl4 *opl4, char *buf, int offset, int size
        spin_unlock_irqrestore(&opl4->reg_lock, flags);
 }
 
-EXPORT_SYMBOL(snd_opl4_read_memory);
-
 void snd_opl4_write_memory(struct snd_opl4 *opl4, const char *buf, int offset, int size)
 {
        unsigned long flags;
@@ -106,8 +100,6 @@ void snd_opl4_write_memory(struct snd_opl4 *opl4, const char *buf, int offset, i
        spin_unlock_irqrestore(&opl4->reg_lock, flags);
 }
 
-EXPORT_SYMBOL(snd_opl4_write_memory);
-
 static void snd_opl4_enable_opl4(struct snd_opl4 *opl4)
 {
        outb(OPL3_REG_MODE, opl4->fm_port + 2);
@@ -222,7 +214,7 @@ int snd_opl4_create(struct snd_card *card,
        opl4->fm_port = fm_port;
        opl4->pcm_port = pcm_port;
        spin_lock_init(&opl4->reg_lock);
-       mutex_init(&opl4->access_mutex);
+       init_MUTEX(&opl4->access_mutex);
 
        err = snd_opl4_detect(opl4);
        if (err < 0) {
@@ -264,6 +256,10 @@ int snd_opl4_create(struct snd_card *card,
        return 0;
 }
 
+EXPORT_SYMBOL(snd_opl4_write);
+EXPORT_SYMBOL(snd_opl4_read);
+EXPORT_SYMBOL(snd_opl4_write_memory);
+EXPORT_SYMBOL(snd_opl4_read_memory);
 EXPORT_SYMBOL(snd_opl4_create);
 
 static int __init alsa_opl4_init(void)