Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abbf121f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman
Browse files

serial: sh-sci: Do not open-code sci_getreg() 



Replace open-coded variants of sci_getreg() by function calls, and drop
intermediate variables where appropriate.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f907c9ea

drivers/tty/serial/sh-sci.c

+2 −5
Original line number Diff line number Diff line
@@ -703,7 +703,6 @@ static void sci_poll_put_char(struct uart_port *port, unsigned char c) 
static void sci_init_pins(struct uart_port *port, unsigned int cflag)

{

	struct sci_port *s = to_sci_port(port);

	const struct plat_sci_reg *reg = sci_regmap[s->cfg->regtype] + SCSPTR;



	/*

	 * Use port-specific handler if provided.
@@ -717,7 +716,7 @@ static void sci_init_pins(struct uart_port *port, unsigned int cflag) 
	 * For the generic path SCSPTR is necessary. Bail out if that's

	 * unavailable, too.

	 */

	if (!reg->size)

	if (!sci_getreg(port, SCSPTR)->size)

		return;



	if ((s->cfg->capabilities & SCIx_HAVE_RTSCTS) &&
@@ -1866,12 +1865,10 @@ static void sci_enable_ms(struct uart_port *port) 


static void sci_break_ctl(struct uart_port *port, int break_state)

{

	struct sci_port *s = to_sci_port(port);

	const struct plat_sci_reg *reg = sci_regmap[s->cfg->regtype] + SCSPTR;

	unsigned short scscr, scsptr;



	/* check wheter the port has SCSPTR */

	if (!reg->size) {

	if (!sci_getreg(port, SCSPTR)->size) {

		/*

		 * Not supported by hardware. Most parts couple break and rx

		 * interrupts together, with break detection always enabled.