module: add per-module param_lock

[karo-tx-linux.git] / arch / um / drivers / hostaudio_kern.c

diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
index 9b90fdc4b151d325e9179424b1b4a44878e357ec..f6b911cc3923a1958f9c393a94799a879c4aa8d9 100644 (file)
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
@@ -185,9 +185,9 @@ static int hostaudio_open(struct inode *inode, struct file *file)
        int ret;
 
 #ifdef DEBUG
-       kparam_block_sysfs_write(dsp);
+       kernel_param_lock(THIS_MODULE);
        printk(KERN_DEBUG "hostaudio: open called (host: %s)\n", dsp);
-       kparam_unblock_sysfs_write(dsp);
+       kernel_param_unlock(THIS_MODULE);
 #endif
 
        state = kmalloc(sizeof(struct hostaudio_state), GFP_KERNEL);
@@ -199,11 +199,11 @@ static int hostaudio_open(struct inode *inode, struct file *file)
        if (file->f_mode & FMODE_WRITE)
                w = 1;
 
-       kparam_block_sysfs_write(dsp);
+       kernel_param_lock(THIS_MODULE);
        mutex_lock(&hostaudio_mutex);
        ret = os_open_file(dsp, of_set_rw(OPENFLAGS(), r, w), 0);
        mutex_unlock(&hostaudio_mutex);
-       kparam_unblock_sysfs_write(dsp);
+       kernel_param_unlock(THIS_MODULE);
 
        if (ret < 0) {
                kfree(state);
@@ -260,17 +260,17 @@ static int hostmixer_open_mixdev(struct inode *inode, struct file *file)
        if (file->f_mode & FMODE_WRITE)
                w = 1;
 
-       kparam_block_sysfs_write(mixer);
+       kernel_param_lock(THIS_MODULE);
        mutex_lock(&hostaudio_mutex);
        ret = os_open_file(mixer, of_set_rw(OPENFLAGS(), r, w), 0);
        mutex_unlock(&hostaudio_mutex);
-       kparam_unblock_sysfs_write(mixer);
+       kernel_param_unlock(THIS_MODULE);
 
        if (ret < 0) {
-               kparam_block_sysfs_write(dsp);
+               kernel_param_lock(THIS_MODULE);
                printk(KERN_ERR "hostaudio_open_mixdev failed to open '%s', "
                       "err = %d\n", dsp, -ret);
-               kparam_unblock_sysfs_write(dsp);
+               kernel_param_unlock(THIS_MODULE);
                kfree(state);
                return ret;
        }
@@ -326,10 +326,10 @@ MODULE_LICENSE("GPL");
 
 static int __init hostaudio_init_module(void)
 {
-       __kernel_param_lock();
+       kernel_param_lock(THIS_MODULE);
        printk(KERN_INFO "UML Audio Relay (host dsp = %s, host mixer = %s)\n",
               dsp, mixer);
-       __kernel_param_unlock();
+       kernel_param_unlock(THIS_MODULE);
 
        module_data.dev_audio = register_sound_dsp(&hostaudio_fops, -1);
        if (module_data.dev_audio < 0) {