mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -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
|
|
@ -623,7 +623,7 @@ static ssize_t wdt_read(struct file *file, char __user *buf,
|
|||
* according to their available features. We only actually usefully support
|
||||
* querying capabilities and current status.
|
||||
*/
|
||||
static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
|
||||
static int wdt_ioctl(struct file *file, unsigned int cmd,
|
||||
unsigned long arg)
|
||||
{
|
||||
int new_margin, rv;
|
||||
|
|
@ -676,6 +676,18 @@ static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
|
|||
return -ENOTTY;
|
||||
}
|
||||
|
||||
static long wdt_unlocked_ioctl(struct file *file, unsigned int cmd,
|
||||
unsigned long arg)
|
||||
{
|
||||
int ret;
|
||||
|
||||
lock_kernel();
|
||||
ret = wdt_ioctl(file, cmd, arg);
|
||||
unlock_kernel();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* wdt_open:
|
||||
* @inode: inode of device
|
||||
|
|
@ -736,7 +748,7 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
|
|||
static const struct file_operations wdt_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.read = wdt_read,
|
||||
.ioctl = wdt_ioctl,
|
||||
.unlocked_ioctl = wdt_unlocked_ioctl,
|
||||
.write = wdt_write,
|
||||
.open = wdt_open,
|
||||
.release = wdt_release,
|
||||
|
|
|
|||
Loading…
Reference in a new issue