Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

serial: core: cleanup in uart_get_baud_rate()

Align with coding guidelines:
Replaced a chain of "else if" by a switch case.

Signed-off-by: Joakim Nordell <joakim.nordell@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Joakim Nordell and committed by
Greg Kroah-Hartman
f10a2233 48a6092f

+16 -5
+16 -5
drivers/tty/serial/serial_core.c
··· 335 335 uart_get_baud_rate(struct uart_port *port, struct ktermios *termios, 336 336 struct ktermios *old, unsigned int min, unsigned int max) 337 337 { 338 - unsigned int try, baud, altbaud = 38400; 338 + unsigned int try; 339 + unsigned int baud; 340 + unsigned int altbaud; 339 341 int hung_up = 0; 340 342 upf_t flags = port->flags & UPF_SPD_MASK; 341 343 342 - if (flags == UPF_SPD_HI) 344 + switch (flags) { 345 + case UPF_SPD_HI: 343 346 altbaud = 57600; 344 - else if (flags == UPF_SPD_VHI) 347 + break; 348 + case UPF_SPD_VHI: 345 349 altbaud = 115200; 346 - else if (flags == UPF_SPD_SHI) 350 + break; 351 + case UPF_SPD_SHI: 347 352 altbaud = 230400; 348 - else if (flags == UPF_SPD_WARP) 353 + break; 354 + case UPF_SPD_WARP: 349 355 altbaud = 460800; 356 + break; 357 + default: 358 + altbaud = 38400; 359 + break; 360 + } 350 361 351 362 for (try = 0; try < 2; try++) { 352 363 baud = tty_termios_baud_rate(termios);