aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-10-13 11:34:06 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 18:18:03 -0500
commit626875381e9ef7fde0717841edcb532033e1c7c9 (patch)
tree374321a526fe85e0c19337e7ffaaa56834058a88
parentf53a2ade0bb9f2a81f473e6469155172a96b7c38 (diff)
tty: istallion: Kill off the BKL ioctl
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>
-rw-r--r--drivers/char/istallion.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 402838f4083e..babfd4401f69 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -621,7 +621,7 @@ static int stli_brdinit(struct stlibrd *brdp);
621static int stli_startbrd(struct stlibrd *brdp); 621static int stli_startbrd(struct stlibrd *brdp);
622static ssize_t stli_memread(struct file *fp, char __user *buf, size_t count, loff_t *offp); 622static ssize_t stli_memread(struct file *fp, char __user *buf, size_t count, loff_t *offp);
623static ssize_t stli_memwrite(struct file *fp, const char __user *buf, size_t count, loff_t *offp); 623static ssize_t stli_memwrite(struct file *fp, const char __user *buf, size_t count, loff_t *offp);
624static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, unsigned long arg); 624static long stli_memioctl(struct file *fp, unsigned int cmd, unsigned long arg);
625static void stli_brdpoll(struct stlibrd *brdp, cdkhdr_t __iomem *hdrp); 625static void stli_brdpoll(struct stlibrd *brdp, cdkhdr_t __iomem *hdrp);
626static void stli_poll(unsigned long arg); 626static void stli_poll(unsigned long arg);
627static int stli_hostcmd(struct stlibrd *brdp, struct stliport *portp); 627static int stli_hostcmd(struct stlibrd *brdp, struct stliport *portp);
@@ -704,7 +704,7 @@ static const struct file_operations stli_fsiomem = {
704 .owner = THIS_MODULE, 704 .owner = THIS_MODULE,
705 .read = stli_memread, 705 .read = stli_memread,
706 .write = stli_memwrite, 706 .write = stli_memwrite,
707 .ioctl = stli_memioctl, 707 .unlocked_ioctl = stli_memioctl,
708}; 708};
709 709
710/*****************************************************************************/ 710/*****************************************************************************/
@@ -4311,7 +4311,7 @@ static int stli_getbrdstruct(struct stlibrd __user *arg)
4311 * reset it, and start/stop it. 4311 * reset it, and start/stop it.
4312 */ 4312 */
4313 4313
4314static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, unsigned long arg) 4314static long stli_memioctl(struct file *fp, unsigned int cmd, unsigned long arg)
4315{ 4315{
4316 struct stlibrd *brdp; 4316 struct stlibrd *brdp;
4317 int brdnr, rc, done; 4317 int brdnr, rc, done;
@@ -4356,7 +4356,7 @@ static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un
4356 * Now handle the board specific ioctls. These all depend on the 4356 * Now handle the board specific ioctls. These all depend on the
4357 * minor number of the device they were called from. 4357 * minor number of the device they were called from.
4358 */ 4358 */
4359 brdnr = iminor(ip); 4359 brdnr = iminor(fp->f_dentry->d_inode);
4360 if (brdnr >= STL_MAXBRDS) 4360 if (brdnr >= STL_MAXBRDS)
4361 return -ENODEV; 4361 return -ENODEV;
4362 brdp = stli_brds[brdnr]; 4362 brdp = stli_brds[brdnr];