From 2fee8811219793cb16ed3f09b5629bb5c78e7dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samo=20Poga=C4=8Dnik?= Date: Tue, 27 Apr 2021 13:43:26 +0200 Subject: ttyprintk: Removed unnecessary TTY ioctl callback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Samo Pogačnik Link: https://lore.kernel.org/r/1502946c760b1aae3ad9cffcf4ea3b9f37206585.camel@t-2.net Signed-off-by: Greg Kroah-Hartman --- drivers/char/ttyprintk.c | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'drivers/char') diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c index 620065b6cef9..219fa1382396 100644 --- a/drivers/char/ttyprintk.c +++ b/drivers/char/ttyprintk.c @@ -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, }; -- cgit v1.2.3