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

Commit 46fb7825 authored by Jiri Slaby's avatar Jiri Slaby Committed by Live-CD User
Browse files

cyclades: remove more duplicated code 



Remove duplicated code from cy_set_line_char. There were 2 if
branches with same contents except flags.

Branch only for the flags computation and use them in the only copy
of the code.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3aeea5b9

drivers/char/cyclades.c

+14 −31
Original line number Original line Diff line number Diff line
@@ -2057,6 +2057,8 @@ static void cy_set_line_char(struct cyclades_port *info, struct tty_struct *tty) 
	channel = info->line - card->first_line;

	channel = info->line - card->first_line;





	if (!cy_is_Z(card)) {

	if (!cy_is_Z(card)) {

		u32 cflags;



		/* baud rate */

		/* baud rate */

		baud = tty_get_baud_rate(tty);

		baud = tty_get_baud_rate(tty);

		if (baud == 38400 && (info->port.flags & ASYNC_SPD_MASK) ==

		if (baud == 38400 && (info->port.flags & ASYNC_SPD_MASK) ==
@@ -2198,37 +2200,18 @@ static void cy_set_line_char(struct cyclades_port *info, struct tty_struct *tty) 
			(info->default_timeout ? info->default_timeout : 0x02));

			(info->default_timeout ? info->default_timeout : 0x02));

		/* 10ms rx timeout */

		/* 10ms rx timeout */





		if (C_CLOCAL(tty)) {

		cflags = CyCTS;

		if (!C_CLOCAL(tty))

			cflags |= CyDSR | CyRI | CyDCD;

		/* without modem intr */

		/* without modem intr */

			cyy_writeb(info, CySRER,

		cyy_writeb(info, CySRER, cyy_readb(info, CySRER) | CyMdmCh);

					cyy_readb(info, CySRER) | CyMdmCh);

		/* act on 1->0 modem transitions */

		/* act on 1->0 modem transitions */

			if ((cflag & CRTSCTS) && info->rflow) {

		if ((cflag & CRTSCTS) && info->rflow)

				cyy_writeb(info, CyMCOR1,

			cyy_writeb(info, CyMCOR1, cflags | rflow_thr[i]);

					  (CyCTS | rflow_thr[i]));

		else

			} else {

			cyy_writeb(info, CyMCOR1, cflags);

				cyy_writeb(info, CyMCOR1,

					  CyCTS);

			}

			/* act on 0->1 modem transitions */

			cyy_writeb(info, CyMCOR2, CyCTS);

		} else {

			/* without modem intr */

			cyy_writeb(info, CySRER,

					cyy_readb(info, CySRER) | CyMdmCh);

			/* act on 1->0 modem transitions */

			if ((cflag & CRTSCTS) && info->rflow) {

				cyy_writeb(info, CyMCOR1,

					  (CyDSR | CyCTS | CyRI | CyDCD |

					   rflow_thr[i]));

			} else {

				cyy_writeb(info, CyMCOR1,

						CyDSR | CyCTS | CyRI | CyDCD);

			}

		/* act on 0->1 modem transitions */

		/* act on 0->1 modem transitions */

			cyy_writeb(info, CyMCOR2,

		cyy_writeb(info, CyMCOR2, cflags);

					CyDSR | CyCTS | CyRI | CyDCD);

		}





		if (i == 0)	/* baud rate is zero, turn off line */

		if (i == 0)	/* baud rate is zero, turn off line */

			cyy_change_rts_dtr(info, 0, TIOCM_DTR);

			cyy_change_rts_dtr(info, 0, TIOCM_DTR);