Commit 2fee8811 authored by Samo Pogačnik's avatar Samo Pogačnik Committed by Greg Kroah-Hartman
Browse files

ttyprintk: Removed unnecessary TTY ioctl callback 



It turns-out, that TIOCCONS is completely handled in tty_io.c, so
the current local ioctl callback is of no real use.

Signed-off-by: default avatarSamo Pogačnik <samo_pogacnik@t-2.net>
Link: https://lore.kernel.org/r/1502946c760b1aae3ad9cffcf4ea3b9f37206585.camel@t-2.net


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bf3d6ab9

drivers/char/ttyprintk.c

+0 −23
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ static int tpk_write(struct tty_struct *tty, 
	unsigned long flags;

	int ret;





	/* exclusive use of tpk_printk within this tty */

	spin_lock_irqsave(&tpkp->spinlock, flags);

	ret = tpk_printk(buf, count);
@@ -126,27 +125,6 @@ static unsigned int tpk_write_room(struct tty_struct *tty) 
	return TPK_MAX_ROOM;

}



/*

 * TTY operations ioctl function.

 */

static int tpk_ioctl(struct tty_struct *tty,

			unsigned int cmd, unsigned long arg)

{

	struct ttyprintk_port *tpkp = tty->driver_data;



	if (!tpkp)

		return -EINVAL;



	switch (cmd) {

	/* Stop TIOCCONS */

	case TIOCCONS:

		return -EOPNOTSUPP;

	default:

		return -ENOIOCTLCMD;

	}

	return 0;

}



/*

 * TTY operations hangup function.

 */
@@ -176,7 +154,6 @@ static const struct tty_operations ttyprintk_ops = { 
	.close = tpk_close,

	.write = tpk_write,

	.write_room = tpk_write_room,

	.ioctl = tpk_ioctl,

	.hangup = tpk_hangup,

};