diff options
Diffstat (limited to 'arch/um/drivers/hostaudio_kern.c')
-rw-r--r-- | arch/um/drivers/hostaudio_kern.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c index 9b90fdc4b151..f6b911cc3923 100644 --- 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) | |||
185 | int ret; | 185 | int ret; |
186 | 186 | ||
187 | #ifdef DEBUG | 187 | #ifdef DEBUG |
188 | kparam_block_sysfs_write(dsp); | 188 | kernel_param_lock(THIS_MODULE); |
189 | printk(KERN_DEBUG "hostaudio: open called (host: %s)\n", dsp); | 189 | printk(KERN_DEBUG "hostaudio: open called (host: %s)\n", dsp); |
190 | kparam_unblock_sysfs_write(dsp); | 190 | kernel_param_unlock(THIS_MODULE); |
191 | #endif | 191 | #endif |
192 | 192 | ||
193 | state = kmalloc(sizeof(struct hostaudio_state), GFP_KERNEL); | 193 | state = kmalloc(sizeof(struct hostaudio_state), GFP_KERNEL); |
@@ -199,11 +199,11 @@ static int hostaudio_open(struct inode *inode, struct file *file) | |||
199 | if (file->f_mode & FMODE_WRITE) | 199 | if (file->f_mode & FMODE_WRITE) |
200 | w = 1; | 200 | w = 1; |
201 | 201 | ||
202 | kparam_block_sysfs_write(dsp); | 202 | kernel_param_lock(THIS_MODULE); |
203 | mutex_lock(&hostaudio_mutex); | 203 | mutex_lock(&hostaudio_mutex); |
204 | ret = os_open_file(dsp, of_set_rw(OPENFLAGS(), r, w), 0); | 204 | ret = os_open_file(dsp, of_set_rw(OPENFLAGS(), r, w), 0); |
205 | mutex_unlock(&hostaudio_mutex); | 205 | mutex_unlock(&hostaudio_mutex); |
206 | kparam_unblock_sysfs_write(dsp); | 206 | kernel_param_unlock(THIS_MODULE); |
207 | 207 | ||
208 | if (ret < 0) { | 208 | if (ret < 0) { |
209 | kfree(state); | 209 | kfree(state); |
@@ -260,17 +260,17 @@ static int hostmixer_open_mixdev(struct inode *inode, struct file *file) | |||
260 | if (file->f_mode & FMODE_WRITE) | 260 | if (file->f_mode & FMODE_WRITE) |
261 | w = 1; | 261 | w = 1; |
262 | 262 | ||
263 | kparam_block_sysfs_write(mixer); | 263 | kernel_param_lock(THIS_MODULE); |
264 | mutex_lock(&hostaudio_mutex); | 264 | mutex_lock(&hostaudio_mutex); |
265 | ret = os_open_file(mixer, of_set_rw(OPENFLAGS(), r, w), 0); | 265 | ret = os_open_file(mixer, of_set_rw(OPENFLAGS(), r, w), 0); |
266 | mutex_unlock(&hostaudio_mutex); | 266 | mutex_unlock(&hostaudio_mutex); |
267 | kparam_unblock_sysfs_write(mixer); | 267 | kernel_param_unlock(THIS_MODULE); |
268 | 268 | ||
269 | if (ret < 0) { | 269 | if (ret < 0) { |
270 | kparam_block_sysfs_write(dsp); | 270 | kernel_param_lock(THIS_MODULE); |
271 | printk(KERN_ERR "hostaudio_open_mixdev failed to open '%s', " | 271 | printk(KERN_ERR "hostaudio_open_mixdev failed to open '%s', " |
272 | "err = %d\n", dsp, -ret); | 272 | "err = %d\n", dsp, -ret); |
273 | kparam_unblock_sysfs_write(dsp); | 273 | kernel_param_unlock(THIS_MODULE); |
274 | kfree(state); | 274 | kfree(state); |
275 | return ret; | 275 | return ret; |
276 | } | 276 | } |
@@ -326,10 +326,10 @@ MODULE_LICENSE("GPL"); | |||
326 | 326 | ||
327 | static int __init hostaudio_init_module(void) | 327 | static int __init hostaudio_init_module(void) |
328 | { | 328 | { |
329 | __kernel_param_lock(); | 329 | kernel_param_lock(THIS_MODULE); |
330 | printk(KERN_INFO "UML Audio Relay (host dsp = %s, host mixer = %s)\n", | 330 | printk(KERN_INFO "UML Audio Relay (host dsp = %s, host mixer = %s)\n", |
331 | dsp, mixer); | 331 | dsp, mixer); |
332 | __kernel_param_unlock(); | 332 | kernel_param_unlock(THIS_MODULE); |
333 | 333 | ||
334 | module_data.dev_audio = register_sound_dsp(&hostaudio_fops, -1); | 334 | module_data.dev_audio = register_sound_dsp(&hostaudio_fops, -1); |
335 | if (module_data.dev_audio < 0) { | 335 | if (module_data.dev_audio < 0) { |