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: Samo Pogačnik <samo_pogacnik@t-2.net>
Link: https://lore.kernel.org/r/1502946c760b1aae3ad9cffcf4ea3b9f37206585.camel@t-2.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c
index 620065b6cef996537d693b949bf5c0e1651d15a8..219fa13823960039521761aacf8f416444311bd6 100644 (file)
--- 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,
 };