Re: [PATCH 1/5] tty/termbits: remove #ifdef CMSPAR that is always defined

[Johan Hovold <johan@kernel.org>]

On Wed, May 11, 2022 at 01:11:35PM +0300, Ilpo Järvinen wrote:
> CMSPAR is defined by all architectures.

For the sake of reviewers please say something about when this changed. 

Also no need to be so verbose in your Subjects

	tty: remove CMSPAR ifdefs

works just fine and is more in line with the prefix typically used for
this subsystem.

> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> ---
>  drivers/char/pcmcia/synclink_cs.c   | 2 --
>  drivers/tty/amiserial.c             | 2 --
>  drivers/tty/serial/8250/8250_port.c | 2 --
>  drivers/tty/serial/jsm/jsm_cls.c    | 6 ------
>  drivers/tty/serial/jsm/jsm_neo.c    | 6 ------
>  drivers/tty/serial/sunsu.c          | 2 --
>  drivers/usb/class/cdc-acm.h         | 8 --------
>  drivers/usb/serial/ark3116.c        | 3 +--
>  drivers/usb/serial/whiteheat.c      | 4 ----
>  9 files changed, 1 insertion(+), 34 deletions(-)

The change itself looks good otherwise.

Reviewed-by: Johan Hovold <johan@kernel.org>

> diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
> index 78baba55a8b5..c20f2cb784e8 100644
> --- 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 533d02b38e02..afb2d373dd47 100644
> --- 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 5591f18f2ea9..78b6dedc43e6 100644
> --- 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 444f233ebd1f..046b624e5f71 100644
> --- 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 110696cdaa1d..0cf586c10688 100644
> --- 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 c31389114b86..fff50b5b82eb 100644
> --- 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 3aa7f0a3ad71..d26ecd15be60 100644
> --- 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 c0e4df87ff22..39eaa7b97c40 100644
> --- 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 06aad0d727dd..332fb92ae575 100644
> --- 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
>   */

Johan