renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-19 08:05:27 +08:00
Code

tty: phase out of ioctl file pointer for tty3270 as well

Browse Source 
The patch "tty: now phase out the ioctl file pointer for good" missed
the tty3270 driver. This is the missing piece.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Heiko Carstens 2011-02-25 14:28:30 +01:00 committed by Greg Kroah-Hartman
parent 310388beea
commit 65c56e073e
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/s390/char/keyboard.c
View File

@ -455,9 +455,7 @@ do_kdgkb_ioctl(struct kbd_data *kbd, struct kbsentry __user *u_kbs,
return 0; return 0;
} }
int int kbd_ioctl(struct kbd_data *kbd, unsigned int cmd, unsigned long arg)
kbd_ioctl(struct kbd_data *kbd, struct file *file,
unsigned int cmd, unsigned long arg)
{ {
void __user *argp; void __user *argp;
int ct, perm; int ct, perm;

2
drivers/s390/char/keyboard.h
View File

@ -36,7 +36,7 @@ void kbd_free(struct kbd_data *);
void kbd_ascebc(struct kbd_data *, unsigned char *); void kbd_ascebc(struct kbd_data *, unsigned char *);
void kbd_keycode(struct kbd_data *, unsigned int); void kbd_keycode(struct kbd_data *, unsigned int);
int kbd_ioctl(struct kbd_data *, struct file *, unsigned int, unsigned long); int kbd_ioctl(struct kbd_data *, unsigned int, unsigned long);
/* /*
* Helper Functions. * Helper Functions.

14
drivers/s390/char/tty3270.c
View File

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