Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 977183902a52d1e0adc986f9462424db5a545044

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

coda/psdev: Remove BKL from ioctl function 

The ioctl function returns constant results, so it obviously
does not need the BKL and can be converted to unlocked_ioctl.

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

... ... @@ -73,8 +73,7 @@
73 73 return mask;
74 74 }
75 75  
76   -static int coda_psdev_ioctl(struct inode * inode, struct file * filp,
77   - unsigned int cmd, unsigned long arg)
  76 +static long coda_psdev_ioctl(struct file * filp, unsigned int cmd, unsigned long arg)
78 77 {
79 78 unsigned int data;
80 79  
... ... @@ -344,7 +343,7 @@
344 343 .read = coda_psdev_read,
345 344 .write = coda_psdev_write,
346 345 .poll = coda_psdev_poll,
347   - .ioctl = coda_psdev_ioctl,
  346 + .unlocked_ioctl = coda_psdev_ioctl,
348 347 .open = coda_psdev_open,
349 348 .release = coda_psdev_release,
350 349 };