|
@@ -1718,9 +1718,8 @@ tty3270_wait_until_sent(struct tty_struct *tty, int timeout)
|
|
|
{
|
|
|
}
|
|
|
|
|
|
-static int
|
|
|
-tty3270_ioctl(struct tty_struct *tty, struct file *file,
|
|
|
- unsigned int cmd, unsigned long arg)
|
|
|
+static int tty3270_ioctl(struct tty_struct *tty, unsigned int cmd,
|
|
|
+ unsigned long arg)
|
|
|
{
|
|
|
struct tty3270 *tp;
|
|
|
|
|
@@ -1729,13 +1728,12 @@ tty3270_ioctl(struct tty_struct *tty, struct file *file,
|
|
|
return -ENODEV;
|
|
|
if (tty->flags & (1 << TTY_IO_ERROR))
|
|
|
return -EIO;
|
|
|
- return kbd_ioctl(tp->kbd, file, cmd, arg);
|
|
|
+ return kbd_ioctl(tp->kbd, cmd, arg);
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_COMPAT
|
|
|
-static long
|
|
|
-tty3270_compat_ioctl(struct tty_struct *tty, struct file *file,
|
|
|
- unsigned int cmd, unsigned long arg)
|
|
|
+static long tty3270_compat_ioctl(struct tty_struct *tty,
|
|
|
+ unsigned int cmd, unsigned long arg)
|
|
|
{
|
|
|
struct tty3270 *tp;
|
|
|
|
|
@@ -1744,7 +1742,7 @@ tty3270_compat_ioctl(struct tty_struct *tty, struct file *file,
|
|
|
return -ENODEV;
|
|
|
if (tty->flags & (1 << TTY_IO_ERROR))
|
|
|
return -EIO;
|
|
|
- return kbd_ioctl(tp->kbd, file, cmd, (unsigned long)compat_ptr(arg));
|
|
|
+ return kbd_ioctl(tp->kbd, cmd, (unsigned long)compat_ptr(arg));
|
|
|
}
|
|
|
#endif
|
|
|
|