evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tty: stallion: kill BKL ioctl

Browse source 
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox 2009-10-13 16:34:15 +01:00 • committed by Greg Kroah-Hartman
parent 626875381e
commit 894cb91770
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/char/stallion.c
View file

@ -407,7 +407,7 @@ static unsigned int stl_baudrates[] = {
* Declare all those functions in this driver! * Declare all those functions in this driver!
*/ */
static int stl_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, unsigned long arg); static long stl_memioctl(struct file *fp, unsigned int cmd, unsigned long arg);
static int stl_brdinit(struct stlbrd *brdp); static int stl_brdinit(struct stlbrd *brdp);
static int stl_getportstats(struct tty_struct *tty, struct stlport *portp, comstats_t __user *cp); static int stl_getportstats(struct tty_struct *tty, struct stlport *portp, comstats_t __user *cp);
static int stl_clrportstats(struct stlport *portp, comstats_t __user *cp); static int stl_clrportstats(struct stlport *portp, comstats_t __user *cp);
@ -607,7 +607,7 @@ static unsigned int sc26198_baudtable[] = {
*/ */
static const struct file_operations stl_fsiomem = { static const struct file_operations stl_fsiomem = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.ioctl = stl_memioctl, .unlocked_ioctl = stl_memioctl,
}; };
static struct class *stallion_class; static struct class *stallion_class;
@ -2486,18 +2486,19 @@ static int stl_getbrdstruct(struct stlbrd __user *arg)
* collection. * collection.
*/ */
static int stl_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, unsigned long arg) static long stl_memioctl(struct file *fp, unsigned int cmd, unsigned long arg)
{ {
int brdnr, rc; int brdnr, rc;
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
pr_debug("stl_memioctl(ip=%p,fp=%p,cmd=%x,arg=%lx)\n", ip, fp, cmd,arg); pr_debug("stl_memioctl(fp=%p,cmd=%x,arg=%lx)\n", fp, cmd,arg);
brdnr = iminor(ip); brdnr = iminor(fp->f_dentry->d_inode);
if (brdnr >= STL_MAXBRDS) if (brdnr >= STL_MAXBRDS)
return -ENODEV; return -ENODEV;
rc = 0; rc = 0;
lock_kernel();
switch (cmd) { switch (cmd) {
case COM_GETPORTSTATS: case COM_GETPORTSTATS:
rc = stl_getportstats(NULL, NULL, argp); rc = stl_getportstats(NULL, NULL, argp);
@ -2518,7 +2519,7 @@ static int stl_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, uns
rc = -ENOIOCTLCMD; rc = -ENOIOCTLCMD;
break; break;
} }
unlock_kernel();
return rc; return rc;
} }