Merge branch 'upstream'

[powerpc.git] / sound / core / info.c

diff --git a/sound/core/info.c b/sound/core/info.c
index ae88539..2582b74 100644 (file)
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -31,6 +31,7 @@
 #include <sound/version.h>
 #include <linux/proc_fs.h>
 #include <linux/devfs_fs_kernel.h>
+#include <linux/mutex.h>
 #include <stdarg.h>
 
 /*
@@ -68,7 +69,7 @@ int snd_info_check_reserved_words(const char *str)
        return 1;
 }
 
-static DECLARE_MUTEX(info_mutex);
+static DEFINE_MUTEX(info_mutex);
 
 struct snd_info_private_data {
        struct snd_info_buffer *rbuffer;
@@ -265,11 +266,11 @@ static int snd_info_entry_open(struct inode *inode, struct file *file)
        struct proc_dir_entry *p;
        int mode, err;
 
-       down(&info_mutex);
+       mutex_lock(&info_mutex);
        p = PDE(inode);
        entry = p == NULL ? NULL : (struct snd_info_entry *)p->data;
        if (entry == NULL || entry->disconnected) {
-               up(&info_mutex);
+               mutex_unlock(&info_mutex);
                return -ENODEV;
        }
        if (!try_module_get(entry->module)) {
@@ -361,13 +362,13 @@ static int snd_info_entry_open(struct inode *inode, struct file *file)
                break;
        }
        file->private_data = data;
-       up(&info_mutex);
+       mutex_unlock(&info_mutex);
        if (entry->content == SNDRV_INFO_CONTENT_TEXT &&
            (mode == O_RDONLY || mode == O_RDWR)) {
                if (entry->c.text.read) {
-                       down(&entry->access);
+                       mutex_lock(&entry->access);
                        entry->c.text.read(entry, data->rbuffer);
-                       up(&entry->access);
+                       mutex_unlock(&entry->access);
                }
        }
        return 0;
@@ -375,7 +376,7 @@ static int snd_info_entry_open(struct inode *inode, struct file *file)
       __error:
        module_put(entry->module);
       __error1:
-       up(&info_mutex);
+       mutex_unlock(&info_mutex);
        return err;
 }
 
@@ -444,8 +445,8 @@ static unsigned int snd_info_entry_poll(struct file *file, poll_table * wait)
        return mask;
 }
 
-static inline int _snd_info_entry_ioctl(struct inode *inode, struct file *file,
-                                       unsigned int cmd, unsigned long arg)
+static long snd_info_entry_ioctl(struct file *file, unsigned int cmd,
+                               unsigned long arg)
 {
        struct snd_info_private_data *data;
        struct snd_info_entry *entry;
@@ -465,17 +466,6 @@ static inline int _snd_info_entry_ioctl(struct inode *inode, struct file *file,
        return -ENOTTY;
 }
 
-/* FIXME: need to unlock BKL to allow preemption */
-static int snd_info_entry_ioctl(struct inode *inode, struct file *file,
-                               unsigned int cmd, unsigned long arg)
-{
-       int err;
-       unlock_kernel();
-       err = _snd_info_entry_ioctl(inode, file, cmd, arg);
-       lock_kernel();
-       return err;
-}
-
 static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma)
 {
        struct inode *inode = file->f_dentry->d_inode;
@@ -499,15 +489,15 @@ static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma)
 
 static struct file_operations snd_info_entry_operations =
 {
-       .owner =        THIS_MODULE,
-       .llseek =       snd_info_entry_llseek,
-       .read =         snd_info_entry_read,
-       .write =        snd_info_entry_write,
-       .poll =         snd_info_entry_poll,
-       .ioctl =        snd_info_entry_ioctl,
-       .mmap =         snd_info_entry_mmap,
-       .open =         snd_info_entry_open,
-       .release =      snd_info_entry_release,
+       .owner =                THIS_MODULE,
+       .llseek =               snd_info_entry_llseek,
+       .read =                 snd_info_entry_read,
+       .write =                snd_info_entry_write,
+       .poll =                 snd_info_entry_poll,
+       .unlocked_ioctl =       snd_info_entry_ioctl,
+       .mmap =                 snd_info_entry_mmap,
+       .open =                 snd_info_entry_open,
+       .release =              snd_info_entry_release,
 };
 
 /**
@@ -758,7 +748,7 @@ static struct snd_info_entry *snd_info_create_entry(const char *name)
        }
        entry->mode = S_IFREG | S_IRUGO;
        entry->content = SNDRV_INFO_CONTENT_TEXT;
-       init_MUTEX(&entry->access);
+       mutex_init(&entry->access);
        return entry;
 }
 
@@ -907,10 +897,10 @@ int snd_info_register(struct snd_info_entry * entry)
 
        snd_assert(entry != NULL, return -ENXIO);
        root = entry->parent == NULL ? snd_proc_root : entry->parent->p;
-       down(&info_mutex);
+       mutex_lock(&info_mutex);
        p = snd_create_proc_entry(entry->name, entry->mode, root);
        if (!p) {
-               up(&info_mutex);
+               mutex_unlock(&info_mutex);
                return -ENOMEM;
        }
        p->owner = entry->module;
@@ -919,7 +909,7 @@ int snd_info_register(struct snd_info_entry * entry)
        p->size = entry->size;
        p->data = entry;
        entry->p = p;
-       up(&info_mutex);
+       mutex_unlock(&info_mutex);
        return 0;
 }
 
@@ -940,9 +930,9 @@ int snd_info_unregister(struct snd_info_entry * entry)
        snd_assert(entry->p != NULL, return -ENXIO);
        root = entry->parent == NULL ? snd_proc_root : entry->parent->p;
        snd_assert(root, return -ENXIO);
-       down(&info_mutex);
+       mutex_lock(&info_mutex);
        snd_remove_proc_entry(root, entry->p);
-       up(&info_mutex);
+       mutex_unlock(&info_mutex);
        snd_info_free_entry(entry);
        return 0;
 }