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

tty: istallion: Kill off the BKL ioctl

Browse source 
Fairly trivial as the BKL push down into the methods has already been done.

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:06 +01:00 • committed by Greg Kroah-Hartman
parent f53a2ade0b
commit 626875381e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/char/istallion.c
View file

@ -621,7 +621,7 @@ static int stli_brdinit(struct stlibrd *brdp);
static int stli_startbrd(struct stlibrd *brdp); static int stli_startbrd(struct stlibrd *brdp);
static ssize_t stli_memread(struct file *fp, char __user *buf, size_t count, loff_t *offp); static ssize_t stli_memread(struct file *fp, char __user *buf, size_t count, loff_t *offp);
static ssize_t stli_memwrite(struct file *fp, const char __user *buf, size_t count, loff_t *offp); static ssize_t stli_memwrite(struct file *fp, const char __user *buf, size_t count, loff_t *offp);
static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, unsigned long arg); static long stli_memioctl(struct file *fp, unsigned int cmd, unsigned long arg);
static void stli_brdpoll(struct stlibrd *brdp, cdkhdr_t __iomem *hdrp); static void stli_brdpoll(struct stlibrd *brdp, cdkhdr_t __iomem *hdrp);
static void stli_poll(unsigned long arg); static void stli_poll(unsigned long arg);
static int stli_hostcmd(struct stlibrd *brdp, struct stliport *portp); static int stli_hostcmd(struct stlibrd *brdp, struct stliport *portp);
@ -704,7 +704,7 @@ static const struct file_operations stli_fsiomem = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.read = stli_memread, .read = stli_memread,
.write = stli_memwrite, .write = stli_memwrite,
.ioctl = stli_memioctl, .unlocked_ioctl = stli_memioctl,
}; };
/*****************************************************************************/ /*****************************************************************************/
@ -4311,7 +4311,7 @@ static int stli_getbrdstruct(struct stlibrd __user *arg)
* reset it, and start/stop it. * reset it, and start/stop it.
*/ */
static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, unsigned long arg) static long stli_memioctl(struct file *fp, unsigned int cmd, unsigned long arg)
{ {
struct stlibrd *brdp; struct stlibrd *brdp;
int brdnr, rc, done; int brdnr, rc, done;
@ -4356,7 +4356,7 @@ static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un
* Now handle the board specific ioctls. These all depend on the * Now handle the board specific ioctls. These all depend on the
* minor number of the device they were called from. * minor number of the device they were called from.
*/ */
brdnr = iminor(ip); brdnr = iminor(fp->f_dentry->d_inode);
if (brdnr >= STL_MAXBRDS) if (brdnr >= STL_MAXBRDS)
return -ENODEV; return -ENODEV;
brdp = stli_brds[brdnr]; brdp = stli_brds[brdnr];