iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tty: remove CMSPAR ifdefs

Browse Source 
CMSPAR is defined by all architectures since commit 6bf08cb246b5
("[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:
Ilpo Järvinen 2022-05-13 11:29:02 +03:00 committed by Greg Kroah-Hartman
parent 44e0b165b6
commit 9fafe73351
9 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/pcmcia/synclink_cs.c
View File

@ -1432,10 +1432,8 @@ static void mgslpc_change_params(MGSLPC_INFO *info, struct tty_struct *tty)
info->params.parity = ASYNC_PARITY_ODD; info->params.parity = ASYNC_PARITY_ODD;
else else
info->params.parity = ASYNC_PARITY_EVEN; info->params.parity = ASYNC_PARITY_EVEN;
#ifdef CMSPAR
if (cflag & CMSPAR) if (cflag & CMSPAR)
info->params.parity = ASYNC_PARITY_SPACE; info->params.parity = ASYNC_PARITY_SPACE;
#endif
} }
/* calculate number of jiffies to transmit a full /* calculate number of jiffies to transmit a full

2
drivers/tty/amiserial.c
View File

@ -588,10 +588,8 @@ static void change_speed(struct tty_struct *tty, struct serial_state *info,
} }
if (!(cflag & PARODD)) if (!(cflag & PARODD))
cval |= UART_LCR_EPAR; cval |= UART_LCR_EPAR;
#ifdef CMSPAR
if (cflag & CMSPAR) if (cflag & CMSPAR)
cval |= UART_LCR_SPAR; cval |= UART_LCR_SPAR;
#endif
/* Determine divisor based on baud rate */ /* Determine divisor based on baud rate */
baud = tty_get_baud_rate(tty); baud = tty_get_baud_rate(tty);

2
drivers/tty/serial/8250/8250_port.c
View File

@ -2620,10 +2620,8 @@ static unsigned char serial8250_compute_lcr(struct uart_8250_port *up,
} }
if (!(c_cflag & PARODD)) if (!(c_cflag & PARODD))
cval |= UART_LCR_EPAR; cval |= UART_LCR_EPAR;
#ifdef CMSPAR
if (c_cflag & CMSPAR) if (c_cflag & CMSPAR)
cval |= UART_LCR_SPAR; cval |= UART_LCR_SPAR;
#endif
return cval; return cval;
} }

6
drivers/tty/serial/jsm/jsm_cls.c
View File

@ -723,14 +723,8 @@ static void cls_param(struct jsm_channel *ch)
if (!(ch->ch_c_cflag & PARODD)) if (!(ch->ch_c_cflag & PARODD))
lcr |= UART_LCR_EPAR; 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) if (ch->ch_c_cflag & CMSPAR)
lcr |= UART_LCR_SPAR; lcr |= UART_LCR_SPAR;
#endif
if (ch->ch_c_cflag & CSTOPB) if (ch->ch_c_cflag & CSTOPB)
lcr |= UART_LCR_STOP; lcr |= UART_LCR_STOP;

6
drivers/tty/serial/jsm/jsm_neo.c
View File

@ -997,14 +997,8 @@ static void neo_param(struct jsm_channel *ch)
if (!(ch->ch_c_cflag & PARODD)) if (!(ch->ch_c_cflag & PARODD))
lcr |= UART_LCR_EPAR; 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) if (ch->ch_c_cflag & CMSPAR)
lcr |= UART_LCR_SPAR; lcr |= UART_LCR_SPAR;
#endif
if (ch->ch_c_cflag & CSTOPB) if (ch->ch_c_cflag & CSTOPB)
lcr |= UART_LCR_STOP; lcr |= UART_LCR_STOP;

2
drivers/tty/serial/sunsu.c
View File

@ -798,10 +798,8 @@ sunsu_change_speed(struct uart_port *port, unsigned int cflag,
cval |= UART_LCR_PARITY; cval |= UART_LCR_PARITY;
if (!(cflag & PARODD)) if (!(cflag & PARODD))
cval |= UART_LCR_EPAR; cval |= UART_LCR_EPAR;
#ifdef CMSPAR
if (cflag & CMSPAR) if (cflag & CMSPAR)
cval |= UART_LCR_SPAR; cval |= UART_LCR_SPAR;
#endif
/* /*
* Work around a bug in the Oxford Semiconductor 952 rev B * Work around a bug in the Oxford Semiconductor 952 rev B

8
drivers/usb/class/cdc-acm.h
View File

@ -7,14 +7,6 @@
* *
*/ */
/*
* CMSPAR, some architectures can't have space and mark parity.
*/
#ifndef CMSPAR
#define CMSPAR 0
#endif
/* /*
* Major and minor numbers. * Major and minor numbers.
*/ */

3
drivers/usb/serial/ark3116.c
View File

@ -208,10 +208,9 @@ static void ark3116_set_termios(struct tty_struct *tty,
lcr |= UART_LCR_PARITY; lcr |= UART_LCR_PARITY;
if (!(cflag & PARODD)) if (!(cflag & PARODD))
lcr |= UART_LCR_EPAR; lcr |= UART_LCR_EPAR;
#ifdef CMSPAR
if (cflag & CMSPAR) if (cflag & CMSPAR)
lcr |= UART_LCR_SPAR; lcr |= UART_LCR_SPAR;
#endif
/* handshake control */ /* handshake control */
hcr = (cflag & CRTSCTS) ? 0x03 : 0x00; hcr = (cflag & CRTSCTS) ? 0x03 : 0x00;

4
drivers/usb/serial/whiteheat.c
View File

@ -30,10 +30,6 @@
#include <linux/usb/ezusb.h> #include <linux/usb/ezusb.h>
#include "whiteheat.h" /* WhiteHEAT specific commands */ #include "whiteheat.h" /* WhiteHEAT specific commands */
#ifndef CMSPAR
#define CMSPAR 0
#endif
/* /*
* Version Information * Version Information
*/ */