mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-26 13:44:15 +08:00
tty: remove CMSPAR ifdefs
CMSPAR is defined by all architectures since commit 6bf08cb246
("[PATCH] Add CMSPAR to termbits.h for powerpc and alpha").
Reviewed-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20220513082906.11096-2-ilpo.jarvinen@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
44e0b165b6
commit
9fafe73351
@ -1432,10 +1432,8 @@ static void mgslpc_change_params(MGSLPC_INFO *info, struct tty_struct *tty)
|
||||
info->params.parity = ASYNC_PARITY_ODD;
|
||||
else
|
||||
info->params.parity = ASYNC_PARITY_EVEN;
|
||||
#ifdef CMSPAR
|
||||
if (cflag & CMSPAR)
|
||||
info->params.parity = ASYNC_PARITY_SPACE;
|
||||
#endif
|
||||
}
|
||||
|
||||
/* calculate number of jiffies to transmit a full
|
||||
|
@ -588,10 +588,8 @@ static void change_speed(struct tty_struct *tty, struct serial_state *info,
|
||||
}
|
||||
if (!(cflag & PARODD))
|
||||
cval |= UART_LCR_EPAR;
|
||||
#ifdef CMSPAR
|
||||
if (cflag & CMSPAR)
|
||||
cval |= UART_LCR_SPAR;
|
||||
#endif
|
||||
|
||||
/* Determine divisor based on baud rate */
|
||||
baud = tty_get_baud_rate(tty);
|
||||
|
@ -2620,10 +2620,8 @@ static unsigned char serial8250_compute_lcr(struct uart_8250_port *up,
|
||||
}
|
||||
if (!(c_cflag & PARODD))
|
||||
cval |= UART_LCR_EPAR;
|
||||
#ifdef CMSPAR
|
||||
if (c_cflag & CMSPAR)
|
||||
cval |= UART_LCR_SPAR;
|
||||
#endif
|
||||
|
||||
return cval;
|
||||
}
|
||||
|
@ -723,14 +723,8 @@ static void cls_param(struct jsm_channel *ch)
|
||||
if (!(ch->ch_c_cflag & PARODD))
|
||||
lcr |= UART_LCR_EPAR;
|
||||
|
||||
/*
|
||||
* Not all platforms support mark/space parity,
|
||||
* so this will hide behind an ifdef.
|
||||
*/
|
||||
#ifdef CMSPAR
|
||||
if (ch->ch_c_cflag & CMSPAR)
|
||||
lcr |= UART_LCR_SPAR;
|
||||
#endif
|
||||
|
||||
if (ch->ch_c_cflag & CSTOPB)
|
||||
lcr |= UART_LCR_STOP;
|
||||
|
@ -997,14 +997,8 @@ static void neo_param(struct jsm_channel *ch)
|
||||
if (!(ch->ch_c_cflag & PARODD))
|
||||
lcr |= UART_LCR_EPAR;
|
||||
|
||||
/*
|
||||
* Not all platforms support mark/space parity,
|
||||
* so this will hide behind an ifdef.
|
||||
*/
|
||||
#ifdef CMSPAR
|
||||
if (ch->ch_c_cflag & CMSPAR)
|
||||
lcr |= UART_LCR_SPAR;
|
||||
#endif
|
||||
|
||||
if (ch->ch_c_cflag & CSTOPB)
|
||||
lcr |= UART_LCR_STOP;
|
||||
|
@ -798,10 +798,8 @@ sunsu_change_speed(struct uart_port *port, unsigned int cflag,
|
||||
cval |= UART_LCR_PARITY;
|
||||
if (!(cflag & PARODD))
|
||||
cval |= UART_LCR_EPAR;
|
||||
#ifdef CMSPAR
|
||||
if (cflag & CMSPAR)
|
||||
cval |= UART_LCR_SPAR;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Work around a bug in the Oxford Semiconductor 952 rev B
|
||||
|
@ -7,14 +7,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
* CMSPAR, some architectures can't have space and mark parity.
|
||||
*/
|
||||
|
||||
#ifndef CMSPAR
|
||||
#define CMSPAR 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Major and minor numbers.
|
||||
*/
|
||||
|
@ -208,10 +208,9 @@ static void ark3116_set_termios(struct tty_struct *tty,
|
||||
lcr |= UART_LCR_PARITY;
|
||||
if (!(cflag & PARODD))
|
||||
lcr |= UART_LCR_EPAR;
|
||||
#ifdef CMSPAR
|
||||
if (cflag & CMSPAR)
|
||||
lcr |= UART_LCR_SPAR;
|
||||
#endif
|
||||
|
||||
/* handshake control */
|
||||
hcr = (cflag & CRTSCTS) ? 0x03 : 0x00;
|
||||
|
||||
|
@ -30,10 +30,6 @@
|
||||
#include <linux/usb/ezusb.h>
|
||||
#include "whiteheat.h" /* WhiteHEAT specific commands */
|
||||
|
||||
#ifndef CMSPAR
|
||||
#define CMSPAR 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Version Information
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user