fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / sound / oss / au1550_ac97.c

diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index bdee050..2197951 100644 (file)
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c
@@ -52,12 +52,14 @@
 #include <linux/spinlock.h>
 #include <linux/smp_lock.h>
 #include <linux/ac97_codec.h>
+#include <linux/mutex.h>
+
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/hardirq.h>
-#include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1xxx_psc.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>
+#include <asm/mach-au1x00/au1xxx.h>
 
 #undef OSS_DOCUMENTED_MIXER_SEMANTICS
 
@@ -77,7 +79,7 @@
  * 0 = no VRA, 1 = use VRA if codec supports it
  */
 static int      vra = 1;
-MODULE_PARM(vra, "i");
+module_param(vra, bool, 0);
 MODULE_PARM_DESC(vra, "if 1 use VRA if codec supports it");
 
 static struct au1550_state {
@@ -90,8 +92,8 @@ static struct au1550_state {
        int             no_vra;         /* do not use VRA */
 
        spinlock_t      lock;
-       struct semaphore open_sem;
-       struct semaphore sem;
+       struct mutex open_mutex;
+       struct mutex sem;
        mode_t          open_mode;
        wait_queue_head_t open_wait;
 
@@ -211,7 +213,8 @@ rdcodec(struct ac97_codec *codec, u8 addr)
        }
        if (i == POLL_COUNT) {
                err("rdcodec: read poll expired!");
-               return 0;
+               data = 0;
+               goto out;
        }
 
        /* wait for command done?
@@ -224,7 +227,8 @@ rdcodec(struct ac97_codec *codec, u8 addr)
        }
        if (i == POLL_COUNT) {
                err("rdcodec: read cmdwait expired!");
-               return 0;
+               data = 0;
+               goto out;
        }
 
        data = au_readl(PSC_AC97CDC) & 0xffff;
@@ -235,6 +239,7 @@ rdcodec(struct ac97_codec *codec, u8 addr)
        au_writel(PSC_AC97EVNT_CD, PSC_AC97EVNT);
        au_sync();
 
+ out:
        spin_unlock_irqrestore(&s->lock, flags);
 
        return data;
@@ -714,8 +719,7 @@ prog_dmabuf_dac(struct au1550_state *s)
 }
 
 
-static void
-dac_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static void dac_dma_interrupt(int irq, void *dev_id)
 {
        struct au1550_state *s = (struct au1550_state *) dev_id;
        struct dmabuf  *db = &s->dma_dac;
@@ -749,8 +753,7 @@ dac_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 
-static void
-adc_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static void adc_dma_interrupt(int irq, void *dev_id)
 {
        struct  au1550_state *s = (struct au1550_state *)dev_id;
        struct  dmabuf  *dp = &s->dma_adc;
@@ -1044,7 +1047,7 @@ au1550_read(struct file *file, char *buffer, size_t count, loff_t *ppos)
 
        count *= db->cnt_factor;
 
-       down(&s->sem);
+       mutex_lock(&s->sem);
        add_wait_queue(&db->wait, &wait);
 
        while (count > 0) {
@@ -1064,14 +1067,14 @@ au1550_read(struct file *file, char *buffer, size_t count, loff_t *ppos)
                                                ret = -EAGAIN;
                                        goto out;
                                }
-                               up(&s->sem);
+                               mutex_unlock(&s->sem);
                                schedule();
                                if (signal_pending(current)) {
                                        if (!ret)
                                                ret = -ERESTARTSYS;
                                        goto out2;
                                }
-                               down(&s->sem);
+                               mutex_lock(&s->sem);
                        }
                } while (avail <= 0);
 
@@ -1099,7 +1102,7 @@ au1550_read(struct file *file, char *buffer, size_t count, loff_t *ppos)
        }                       /* while (count > 0) */
 
 out:
-       up(&s->sem);
+       mutex_unlock(&s->sem);
 out2:
        remove_wait_queue(&db->wait, &wait);
        set_current_state(TASK_RUNNING);
@@ -1125,7 +1128,7 @@ au1550_write(struct file *file, const char *buffer, size_t count, loff_t * ppos)
 
        count *= db->cnt_factor;
 
-       down(&s->sem);
+       mutex_lock(&s->sem);
        add_wait_queue(&db->wait, &wait);
 
        while (count > 0) {
@@ -1143,14 +1146,14 @@ au1550_write(struct file *file, const char *buffer, size_t count, loff_t * ppos)
                                                ret = -EAGAIN;
                                        goto out;
                                }
-                               up(&s->sem);
+                               mutex_unlock(&s->sem);
                                schedule();
                                if (signal_pending(current)) {
                                        if (!ret)
                                                ret = -ERESTARTSYS;
                                        goto out2;
                                }
-                               down(&s->sem);
+                               mutex_lock(&s->sem);
                        }
                } while (avail <= 0);
 
@@ -1196,7 +1199,7 @@ au1550_write(struct file *file, const char *buffer, size_t count, loff_t * ppos)
        }                       /* while (count > 0) */
 
 out:
-       up(&s->sem);
+       mutex_unlock(&s->sem);
 out2:
        remove_wait_queue(&db->wait, &wait);
        set_current_state(TASK_RUNNING);
@@ -1253,7 +1256,7 @@ au1550_mmap(struct file *file, struct vm_area_struct *vma)
        int ret = 0;
 
        lock_kernel();
-       down(&s->sem);
+       mutex_lock(&s->sem);
        if (vma->vm_flags & VM_WRITE)
                db = &s->dma_dac;
        else if (vma->vm_flags & VM_READ)
@@ -1279,7 +1282,7 @@ au1550_mmap(struct file *file, struct vm_area_struct *vma)
        vma->vm_flags &= ~VM_IO;
        db->mapped = 1;
 out:
-       up(&s->sem);
+       mutex_unlock(&s->sem);
        unlock_kernel();
        return ret;
 }
@@ -1790,21 +1793,21 @@ au1550_open(struct inode *inode, struct file *file)
 
        file->private_data = s;
        /* wait for device to become free */
-       down(&s->open_sem);
+       mutex_lock(&s->open_mutex);
        while (s->open_mode & file->f_mode) {
                if (file->f_flags & O_NONBLOCK) {
-                       up(&s->open_sem);
+                       mutex_unlock(&s->open_mutex);
                        return -EBUSY;
                }
                add_wait_queue(&s->open_wait, &wait);
                __set_current_state(TASK_INTERRUPTIBLE);
-               up(&s->open_sem);
+               mutex_unlock(&s->open_mutex);
                schedule();
                remove_wait_queue(&s->open_wait, &wait);
                set_current_state(TASK_RUNNING);
                if (signal_pending(current))
                        return -ERESTARTSYS;
-               down(&s->open_sem);
+               mutex_lock(&s->open_mutex);
        }
 
        stop_dac(s);
@@ -1840,8 +1843,8 @@ au1550_open(struct inode *inode, struct file *file)
        }
 
        s->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE);
-       up(&s->open_sem);
-       init_MUTEX(&s->sem);
+       mutex_unlock(&s->open_mutex);
+       mutex_init(&s->sem);
        return 0;
 }
 
@@ -1858,7 +1861,7 @@ au1550_release(struct inode *inode, struct file *file)
                lock_kernel();
        }
 
-       down(&s->open_sem);
+       mutex_lock(&s->open_mutex);
        if (file->f_mode & FMODE_WRITE) {
                stop_dac(s);
                kfree(s->dma_dac.rawbuf);
@@ -1870,7 +1873,7 @@ au1550_release(struct inode *inode, struct file *file)
                s->dma_adc.rawbuf = NULL;
        }
        s->open_mode &= ((~file->f_mode) & (FMODE_READ|FMODE_WRITE));
-       up(&s->open_sem);
+       mutex_unlock(&s->open_mutex);
        wake_up(&s->open_wait);
        unlock_kernel();
        return 0;
@@ -1890,6 +1893,8 @@ static /*const */ struct file_operations au1550_audio_fops = {
 
 MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@embeddededge.com");
 MODULE_DESCRIPTION("Au1550 AC97 Audio Driver");
+MODULE_LICENSE("GPL");
+
 
 static int __devinit
 au1550_probe(void)
@@ -1902,7 +1907,7 @@ au1550_probe(void)
        init_waitqueue_head(&s->dma_adc.wait);
        init_waitqueue_head(&s->dma_dac.wait);
        init_waitqueue_head(&s->open_wait);
-       init_MUTEX(&s->open_sem);
+       mutex_init(&s->open_mutex);
        spin_lock_init(&s->lock);
 
        s->codec = ac97_alloc_codec();