summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorSamo Pogačnik <samo_pogacnik@t-2.net>2021-04-27 13:43:26 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-13 18:29:12 +0200
commit2fee8811219793cb16ed3f09b5629bb5c78e7dbb (patch)
tree4c347bcaa8c1058dd226cc6f9bcae8e5852a02da /drivers/char
parentbf3d6ab9bc1295fdf37cbc363ba9f7dfa14a84b8 (diff)
downloadlinux-2fee8811219793cb16ed3f09b5629bb5c78e7dbb.tar.gz
linux-2fee8811219793cb16ed3f09b5629bb5c78e7dbb.tar.bz2
linux-2fee8811219793cb16ed3f09b5629bb5c78e7dbb.zip
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>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/ttyprintk.c23
1 files changed, 0 insertions, 23 deletions
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);
@@ -127,27 +126,6 @@ static unsigned int tpk_write_room(struct tty_struct *tty)
}
/*
- * 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.
*/
static void tpk_hangup(struct tty_struct *tty)
@@ -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,
};