Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d5f1d54cbc1b2f320ac054b2df519dec22a27779

Authored by Arnd Bergmann
Committed by Frederic Weisbecker
1 parent 1114b68468
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

um/mmapper: Remove BKL usage 

An empty function does not need the BKL, so just remove it.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>

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

arch/um/drivers/mmapper_kern.c
Diff comments   View file @ d5f1d54
... ... @@ -46,8 +46,7 @@
46 46 return count;
47 47 }
48 48  
49   -static int mmapper_ioctl(struct inode *inode, struct file *file,
50   - unsigned int cmd, unsigned long arg)
  49 +static long mmapper_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
51 50 {
52 51 return -ENOIOCTLCMD;
53 52 }
... ... @@ -90,7 +89,7 @@
90 89 .owner = THIS_MODULE,
91 90 .read = mmapper_read,
92 91 .write = mmapper_write,
93   - .ioctl = mmapper_ioctl,
  92 + .unlocked_ioctl = mmapper_ioctl,
94 93 .mmap = mmapper_mmap,
95 94 .open = mmapper_open,
96 95 .release = mmapper_release,