Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65c56e07 authored by Heiko Carstens's avatar Heiko Carstens Committed by Greg Kroah-Hartman
Browse files

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



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

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 310388be

drivers/s390/char/keyboard.c

+1 −3
Original line number Diff line number Diff line
@@ -455,9 +455,7 @@ do_kdgkb_ioctl(struct kbd_data *kbd, struct kbsentry __user *u_kbs, 
	return 0;

}



int

kbd_ioctl(struct kbd_data *kbd, struct file *file,

	  unsigned int cmd, unsigned long arg)

int kbd_ioctl(struct kbd_data *kbd, unsigned int cmd, unsigned long arg)

{

	void __user *argp;

	int ct, perm;

drivers/s390/char/keyboard.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ void kbd_free(struct kbd_data *); 
void kbd_ascebc(struct kbd_data *, unsigned char *);



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.

drivers/s390/char/tty3270.c

+6 −8
Original line number Diff line number Diff line
@@ -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,12 +1728,11 @@ 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,

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