From: Jiri Slaby <jslaby@suse.cz>
Date: Fri, 18 Jun 2021 06:14:35 +0000 (+0200)
Subject: mxser: remove MOXA_ASPP_OQUEUE ioctl
X-Git-Tag: v5.14-rc1~65^2~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7574ca74a6e9021f6a058aa21dab84e552cab22;p=thirdparty%2Fkernel%2Flinux.git

mxser: remove MOXA_ASPP_OQUEUE ioctl

1) The semantics are defined exactly nowhere.
2) The ioctl definition was never exposed to userspace, so noone should
   actually be reliably using this.
3) It's not even mentioned in any of the mxser utilities.

Provided the above, remove this mxser-special ioctl.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210618061516.662-30-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 1eb48141d6ca4..ca417d9a03cf3 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -60,8 +60,6 @@
 #define RS485_4WIRE_MODE	3
 #define OP_MODE_MASK		3
 
-#define MOXA_ASPP_OQUEUE	(MOXA + 70)
-
 /* --------------------------------------------------- */
 
 /*
@@ -1499,17 +1497,6 @@ static int mxser_ioctl(struct tty_struct *tty,
 				mxser_cflags_changed(info, arg, &cnow));
 	case MOXA_HighSpeedOn:
 		return put_user(info->baud_base != 115200 ? 1 : 0, (int __user *)argp);
-	case MOXA_ASPP_OQUEUE:{
-		int len, lsr;
-
-		len = mxser_chars_in_buffer(tty);
-		spin_lock_irq(&info->slock);
-		lsr = inb(info->ioaddr + UART_LSR) & UART_LSR_THRE;
-		spin_unlock_irq(&info->slock);
-		len += (lsr ? 0 : 1);
-
-		return put_user(len, (int __user *)argp);
-	}
 	default:
 		return -ENOIOCTLCMD;
 	}