mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
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 <[email protected]> Signed-off-by: Frederic Weisbecker <[email protected]>
This commit is contained in:
parent
703c631ebb
commit
55929332c9
23 changed files with 280 additions and 115 deletions
|
|
@ -818,8 +818,7 @@ static u_int ds_poll(struct file *file, poll_table *wait)
|
|||
|
||||
/*====================================================================*/
|
||||
|
||||
static int ds_ioctl(struct inode *inode, struct file *file,
|
||||
u_int cmd, u_long arg)
|
||||
static int ds_ioctl(struct file *file, u_int cmd, u_long arg)
|
||||
{
|
||||
struct pcmcia_socket *s;
|
||||
void __user *uarg = (char __user *)arg;
|
||||
|
|
@ -1026,13 +1025,25 @@ free_out:
|
|||
return err;
|
||||
} /* ds_ioctl */
|
||||
|
||||
static long ds_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
int ret;
|
||||
|
||||
lock_kernel();
|
||||
ret = ds_ioctl(file, cmd, arg);
|
||||
unlock_kernel();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/*====================================================================*/
|
||||
|
||||
static const struct file_operations ds_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = ds_open,
|
||||
.release = ds_release,
|
||||
.ioctl = ds_ioctl,
|
||||
.unlocked_ioctl = ds_unlocked_ioctl,
|
||||
.read = ds_read,
|
||||
.write = ds_write,
|
||||
.poll = ds_poll,
|
||||
|
|
|
|||
Loading…
Reference in a new issue