diff options
Diffstat (limited to 'drivers/s390/char/tty3270.c')
-rw-r--r-- | drivers/s390/char/tty3270.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c index 911822db614d..d33554df2b06 100644 --- a/drivers/s390/char/tty3270.c +++ b/drivers/s390/char/tty3270.c | |||
@@ -1718,9 +1718,8 @@ tty3270_wait_until_sent(struct tty_struct *tty, int timeout) | |||
1718 | { | 1718 | { |
1719 | } | 1719 | } |
1720 | 1720 | ||
1721 | static int | 1721 | static int tty3270_ioctl(struct tty_struct *tty, unsigned int cmd, |
1722 | tty3270_ioctl(struct tty_struct *tty, struct file *file, | 1722 | unsigned long arg) |
1723 | unsigned int cmd, unsigned long arg) | ||
1724 | { | 1723 | { |
1725 | struct tty3270 *tp; | 1724 | struct tty3270 *tp; |
1726 | 1725 | ||
@@ -1729,13 +1728,12 @@ tty3270_ioctl(struct tty_struct *tty, struct file *file, | |||
1729 | return -ENODEV; | 1728 | return -ENODEV; |
1730 | if (tty->flags & (1 << TTY_IO_ERROR)) | 1729 | if (tty->flags & (1 << TTY_IO_ERROR)) |
1731 | return -EIO; | 1730 | return -EIO; |
1732 | return kbd_ioctl(tp->kbd, file, cmd, arg); | 1731 | return kbd_ioctl(tp->kbd, cmd, arg); |
1733 | } | 1732 | } |
1734 | 1733 | ||
1735 | #ifdef CONFIG_COMPAT | 1734 | #ifdef CONFIG_COMPAT |
1736 | static long | 1735 | static long tty3270_compat_ioctl(struct tty_struct *tty, |
1737 | tty3270_compat_ioctl(struct tty_struct *tty, struct file *file, | 1736 | unsigned int cmd, unsigned long arg) |
1738 | unsigned int cmd, unsigned long arg) | ||
1739 | { | 1737 | { |
1740 | struct tty3270 *tp; | 1738 | struct tty3270 *tp; |
1741 | 1739 | ||
@@ -1744,7 +1742,7 @@ tty3270_compat_ioctl(struct tty_struct *tty, struct file *file, | |||
1744 | return -ENODEV; | 1742 | return -ENODEV; |
1745 | if (tty->flags & (1 << TTY_IO_ERROR)) | 1743 | if (tty->flags & (1 << TTY_IO_ERROR)) |
1746 | return -EIO; | 1744 | return -EIO; |
1747 | return kbd_ioctl(tp->kbd, file, cmd, (unsigned long)compat_ptr(arg)); | 1745 | return kbd_ioctl(tp->kbd, cmd, (unsigned long)compat_ptr(arg)); |
1748 | } | 1746 | } |
1749 | #endif | 1747 | #endif |
1750 | 1748 | ||