tty: remove CMSPAR ifdefs

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>

diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 78baba55a8b5c115950502fea969fb98d0462b33..c20f2cb784e86659c09ee48d0c73e38c63ef142c 100644 (file)
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -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

diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index 533d02b38e02e57d64fc7192089d16a047b9e3f7..afb2d373dd474aa969e327b4d8efd7363c964d78 100644 (file)
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -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);

diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 5591f18f2ea95ee2cae2f9cfe13f9a6c99f8a555..78b6dedc43e6b89ce71c0b79a320ce8f8efd5840 100644 (file)
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -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;
 }

diff --git a/drivers/tty/serial/jsm/jsm_cls.c b/drivers/tty/serial/jsm/jsm_cls.c
index 444f233ebd1fd47b8e911ca1e776282dd4527384..046b624e5f71dd14dd5c258bfffcddc53aa2a2f4 100644 (file)
--- a/drivers/tty/serial/jsm/jsm_cls.c
+++ b/drivers/tty/serial/jsm/jsm_cls.c
@@ -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;

diff --git a/drivers/tty/serial/jsm/jsm_neo.c b/drivers/tty/serial/jsm/jsm_neo.c
index 110696cdaa1df4e78c1a3546c240731249d1144a..0cf586c10688d2c2c1bdf55c4e0c4bd2385bd9da 100644 (file)
--- a/drivers/tty/serial/jsm/jsm_neo.c
+++ b/drivers/tty/serial/jsm/jsm_neo.c
@@ -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;

diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index c31389114b86da406af6094d456eb42f69dbabfa..fff50b5b82eb57c69b40089afef48617a7c0dcbf 100644 (file)
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -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

diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index 3aa7f0a3ad71e8bcd3b17c7a6d2df3f8b52175bb..d26ecd15be60e8dd7dfa39bbdc9dc2c71170a507 100644 (file)
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -7,14 +7,6 @@
  *
  */
 
-/*
- * CMSPAR, some architectures can't have space and mark parity.
- */
-
-#ifndef CMSPAR
-#define CMSPAR                 0
-#endif
-
 /*
  * Major and minor numbers.
  */

diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
index c0e4df87ff22da32de48cc05b7a97fa6a3b62193..39eaa7b97c404bc324fc6e9585c2ef115708e337 100644 (file)
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -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;
 

diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 06aad0d727ddcdd57962f08acbc666d2da9fbff6..332fb92ae575f9bd0e62f66abf435879386af595 100644 (file)
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -30,10 +30,6 @@
 #include <linux/usb/ezusb.h>
 #include "whiteheat.h"                 /* WhiteHEAT specific commands */
 
-#ifndef CMSPAR
-#define CMSPAR 0
-#endif
-
 /*
  * Version Information
  */