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

Commit cc568849 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

serial: imx: reorder functions and simplify a bit 



Now that imx_mctrl_check is implemented below imx_get_mctrl the former
can call the latter directly instead of via sport->port.ops->get_mctrl.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 90ebc483

drivers/tty/serial/imx.c

+45 −45
Original line number Original line Diff line number Diff line
@@ -311,51 +311,6 @@ static void imx_port_ucrs_restore(struct uart_port *port, 
}

}

#endif

#endif





/*

 * Handle any change of modem status signal since we were last called.

 */

static void imx_mctrl_check(struct imx_port *sport)

{

	unsigned int status, changed;



	status = sport->port.ops->get_mctrl(&sport->port);

	changed = status ^ sport->old_status;



	if (changed == 0)

		return;



	sport->old_status = status;



	if (changed & TIOCM_RI)

		sport->port.icount.rng++;

	if (changed & TIOCM_DSR)

		sport->port.icount.dsr++;

	if (changed & TIOCM_CAR)

		uart_handle_dcd_change(&sport->port, status & TIOCM_CAR);

	if (changed & TIOCM_CTS)

		uart_handle_cts_change(&sport->port, status & TIOCM_CTS);



	wake_up_interruptible(&sport->port.state->port.delta_msr_wait);

}



/*

 * This is our per-port timeout handler, for checking the

 * modem status signals.

 */

static void imx_timeout(unsigned long data)

{

	struct imx_port *sport = (struct imx_port *)data;

	unsigned long flags;



	if (sport->port.state) {

		spin_lock_irqsave(&sport->port.lock, flags);

		imx_mctrl_check(sport);

		spin_unlock_irqrestore(&sport->port.lock, flags);



		mod_timer(&sport->timer, jiffies + MCTRL_TIMEOUT);

	}

}



/*

/*

 * interrupts disabled on entry

 * interrupts disabled on entry

 */

 */
@@ -868,6 +823,51 @@ static void imx_break_ctl(struct uart_port *port, int break_state) 
	spin_unlock_irqrestore(&sport->port.lock, flags);

	spin_unlock_irqrestore(&sport->port.lock, flags);

}

}





/*

 * Handle any change of modem status signal since we were last called.

 */

static void imx_mctrl_check(struct imx_port *sport)

{

	unsigned int status, changed;



	status = imx_get_mctrl(&sport->port);

	changed = status ^ sport->old_status;



	if (changed == 0)

		return;



	sport->old_status = status;



	if (changed & TIOCM_RI)

		sport->port.icount.rng++;

	if (changed & TIOCM_DSR)

		sport->port.icount.dsr++;

	if (changed & TIOCM_CAR)

		uart_handle_dcd_change(&sport->port, status & TIOCM_CAR);

	if (changed & TIOCM_CTS)

		uart_handle_cts_change(&sport->port, status & TIOCM_CTS);



	wake_up_interruptible(&sport->port.state->port.delta_msr_wait);

}



/*

 * This is our per-port timeout handler, for checking the

 * modem status signals.

 */

static void imx_timeout(unsigned long data)

{

	struct imx_port *sport = (struct imx_port *)data;

	unsigned long flags;



	if (sport->port.state) {

		spin_lock_irqsave(&sport->port.lock, flags);

		imx_mctrl_check(sport);

		spin_unlock_irqrestore(&sport->port.lock, flags);



		mod_timer(&sport->timer, jiffies + MCTRL_TIMEOUT);

	}

}



#define RX_BUF_SIZE	(PAGE_SIZE)

#define RX_BUF_SIZE	(PAGE_SIZE)

static void imx_rx_dma_done(struct imx_port *sport)

static void imx_rx_dma_done(struct imx_port *sport)

{

{