drivers: Push down BKL into various drivers

These are the last remaining device drivers using
the ->ioctl file operation in the drivers directory
(except from v4l drivers).

[fweisbec: drop i8k pushdown as it has been done from
procfs pushdown branch already]

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

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c
index f80810901db6..043a1c7b86be 100644
--- a/drivers/char/nwflash.c
+++ b/drivers/char/nwflash.c
@@ -94,8 +94,9 @@ static int get_flash_id(void)
         return c2;
 }
 
-static int flash_ioctl(struct inode *inodep, struct file *filep, unsigned int cmd, unsigned long arg)
+static long flash_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
 {
+        lock_kernel();
         switch (cmd) {
         case CMD_WRITE_DISABLE:
                 gbWriteBase64Enable = 0;
@@ -113,8 +114,10 @@ static int flash_ioctl(struct inode *inodep, struct file *filep, unsigned int cm
         default:
                 gbWriteBase64Enable = 0;
                 gbWriteEnable = 0;
+                unlock_kernel();
                 return -EINVAL;
         }
+        unlock_kernel();
         return 0;
 }
 
@@ -631,7 +634,7 @@ static const struct file_operations flash_fops =
         .llseek         = flash_llseek,
         .read           = flash_read,
         .write          = flash_write,
-        .ioctl          = flash_ioctl,
+        .unlocked_ioctl = flash_ioctl,
 };
 
 static struct miscdevice flash_miscdev =