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

tty: remove IBSHIFT ifdefs

Browse Source 
IBSHIFT is defined by all architectures since commit d0ffb805b7
("arch/alpha, termios: implement BOTHER, IBSHIFT and termios2").

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-4-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:04 +03:00 committed by Greg Kroah-Hartman
parent 69648d7bda
commit 9cca25e276
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/tty/tty_baudrate.c
View File

@ -91,7 +91,6 @@ EXPORT_SYMBOL(tty_termios_baud_rate);
speed_t tty_termios_input_baud_rate(struct ktermios *termios) speed_t tty_termios_input_baud_rate(struct ktermios *termios)
{ {
#ifdef IBSHIFT
unsigned int cbaud = (termios->c_cflag >> IBSHIFT) & CBAUD; unsigned int cbaud = (termios->c_cflag >> IBSHIFT) & CBAUD;
if (cbaud == B0) if (cbaud == B0)
@ -110,9 +109,6 @@ speed_t tty_termios_input_baud_rate(struct ktermios *termios)
cbaud += 15; cbaud += 15;
} }
return cbaud >= n_baud_table ? 0 : baud_table[cbaud]; return cbaud >= n_baud_table ? 0 : baud_table[cbaud];
#else /* IBSHIFT */
return tty_termios_baud_rate(termios);
#endif /* IBSHIFT */
} }
EXPORT_SYMBOL(tty_termios_input_baud_rate); EXPORT_SYMBOL(tty_termios_input_baud_rate);
@ -152,10 +148,9 @@ void tty_termios_encode_baud_rate(struct ktermios *termios,
termios->c_ispeed = ibaud; termios->c_ispeed = ibaud;
termios->c_ospeed = obaud; termios->c_ospeed = obaud;
#ifdef IBSHIFT
if (((termios->c_cflag >> IBSHIFT) & CBAUD) != B0) if (((termios->c_cflag >> IBSHIFT) & CBAUD) != B0)
ibinput = 1; /* An input speed was specified */ ibinput = 1; /* An input speed was specified */
#endif
/* If the user asked for a precise weird speed give a precise weird /* If the user asked for a precise weird speed give a precise weird
* answer. If they asked for a Bfoo speed they may have problems * answer. If they asked for a Bfoo speed they may have problems
* digesting non-exact replies so fuzz a bit. * digesting non-exact replies so fuzz a bit.
@ -170,9 +165,7 @@ void tty_termios_encode_baud_rate(struct ktermios *termios,
iclose = 0; iclose = 0;
termios->c_cflag &= ~CBAUD; termios->c_cflag &= ~CBAUD;
#ifdef IBSHIFT
termios->c_cflag &= ~(CBAUD << IBSHIFT); termios->c_cflag &= ~(CBAUD << IBSHIFT);
#endif
/* /*
* Our goal is to find a close match to the standard baud rate * Our goal is to find a close match to the standard baud rate
@ -192,14 +185,12 @@ void tty_termios_encode_baud_rate(struct ktermios *termios,
/* For the case input == output don't set IBAUD bits /* For the case input == output don't set IBAUD bits
* if the user didn't do so. * if the user didn't do so.
*/ */
if (ofound == i && !ibinput) if (ofound == i && !ibinput) {
ifound = i; ifound = i;
#ifdef IBSHIFT } else {
else {
ifound = i; ifound = i;
termios->c_cflag |= (baud_bits[i] << IBSHIFT); termios->c_cflag |= (baud_bits[i] << IBSHIFT);
} }
#endif
} }
} while (++i < n_baud_table); } while (++i < n_baud_table);