Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 17:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

mxser: remove MOXA_ASPP_LSTATUS ioctl

Browse Source 
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-26-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2021-06-18 08:14:31 +02:00 committed by Greg Kroah-Hartman
parent 644c55d229
commit 489435e4ab
1 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/tty/mxser.c
View File

@ -64,16 +64,9 @@
#define OP_MODE_MASK 3
#define MOXA_ASPP_OQUEUE (MOXA + 70)
#define MOXA_ASPP_LSTATUS (MOXA + 74)
/* --------------------------------------------------- */
#define NPPI_NOTIFY_PARITY 0x01
#define NPPI_NOTIFY_FRAMING 0x02
#define NPPI_NOTIFY_HW_OVERRUN 0x04
#define NPPI_NOTIFY_SW_OVERRUN 0x08
#define NPPI_NOTIFY_BREAK 0x10
/*
* Follow just what Moxa Must chip defines.
*
@ -304,7 +297,6 @@ struct mxser_port {
unsigned char ldisc_stop_rx;
int custom_divisor;
unsigned char err_shadow;
struct async_icount icount; /* kernel counters for 4 input interrupts */
unsigned int timeout;
@ -1601,13 +1593,6 @@ static int mxser_ioctl(struct tty_struct *tty,
return put_user(len, (int __user *)argp);
}
case MOXA_ASPP_LSTATUS: {
if (put_user(info->err_shadow, (unsigned char __user *)argp))
return -EFAULT;
info->err_shadow = 0;
return 0;
}
default:
return -ENOIOCTLCMD;
}
@ -2033,15 +2018,6 @@ static bool mxser_port_isr(struct mxser_port *port)
status = inb(port->ioaddr + UART_LSR);
if (status & UART_LSR_PE)
port->err_shadow |= NPPI_NOTIFY_PARITY;
if (status & UART_LSR_FE)
port->err_shadow |= NPPI_NOTIFY_FRAMING;
if (status & UART_LSR_OE)
port->err_shadow |= NPPI_NOTIFY_HW_OVERRUN;
if (status & UART_LSR_BI)
port->err_shadow |= NPPI_NOTIFY_BREAK;
if (port->board->must_hwid) {
if (iir == MOXA_MUST_IIR_GDA ||
iir == MOXA_MUST_IIR_RDA ||
@ -2172,7 +2148,6 @@ static int mxser_initbrd(struct mxser_board *brd)
info->port.close_delay = 5 * HZ / 10;
info->port.closing_wait = 30 * HZ;
info->normal_termios = mxvar_sdriver->init_termios;
info->err_shadow = 0;
spin_lock_init(&info->slock);
/* before set INT ISR, disable all int */