Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d6c89d9aca0933d90ab926bf448b32f24a163792

Authored by John Kacur
Committed by Frederic Weisbecker
1 parent 93d84b6d99
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

uml: Convert to unlocked_ioctls to remove implicit BKL 

Convert hostaudio_ioctl and hostmixer_ioctl_mixdev to
unlocked_ioctl without pushdown.

There is nothing to protect inside, the synchronization
is made from the host already.

Signed-off-by: John Kacur <jkacur@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

arch/um/drivers/hostaudio_kern.c
Diff comments   View file @ d6c89d9
... ... @@ -136,7 +136,7 @@
136 136 return mask;
137 137 }
138 138  
139   -static int hostaudio_ioctl(struct inode *inode, struct file *file,
  139 +static long hostaudio_ioctl(struct file *file,
140 140 unsigned int cmd, unsigned long arg)
141 141 {
142 142 struct hostaudio_state *state = file->private_data;
... ... @@ -223,7 +223,7 @@
223 223  
224 224 /* /dev/mixer file operations */
225 225  
226   -static int hostmixer_ioctl_mixdev(struct inode *inode, struct file *file,
  226 +static long hostmixer_ioctl_mixdev(struct file *file,
227 227 unsigned int cmd, unsigned long arg)
228 228 {
229 229 struct hostmixer_state *state = file->private_data;
... ... @@ -289,7 +289,7 @@
289 289 .read = hostaudio_read,
290 290 .write = hostaudio_write,
291 291 .poll = hostaudio_poll,
292   - .ioctl = hostaudio_ioctl,
  292 + .unlocked_ioctl = hostaudio_ioctl,
293 293 .mmap = NULL,
294 294 .open = hostaudio_open,
295 295 .release = hostaudio_release,
... ... @@ -298,7 +298,7 @@
298 298 static const struct file_operations hostmixer_fops = {
299 299 .owner = THIS_MODULE,
300 300 .llseek = no_llseek,
301   - .ioctl = hostmixer_ioctl_mixdev,
  301 + .unlocked_ioctl = hostmixer_ioctl_mixdev,
302 302 .open = hostmixer_open_mixdev,
303 303 .release = hostmixer_release,
304 304 };