Commit 968d6457 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Greg Kroah-Hartman

serial: Make uart_handle_cts_change() status param bool active

Convert uart_handle_cts_change() to bool which is more appropriate
than unsigned int.

Rename status to active to better describe what the parameter means.
While at it, make the comment about the active parameter easier to
parse.

Cleanup callsites from operations that are not necessary with bool.
Reviewed-by: default avatarJiri Slaby <jirislaby@kernel.org>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20230117090358.4796-10-ilpo.jarvinen@linux.intel.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0388a152
...@@ -773,7 +773,7 @@ static irqreturn_t __imx_uart_rtsint(int irq, void *dev_id) ...@@ -773,7 +773,7 @@ static irqreturn_t __imx_uart_rtsint(int irq, void *dev_id)
imx_uart_writel(sport, USR1_RTSD, USR1); imx_uart_writel(sport, USR1_RTSD, USR1);
usr1 = imx_uart_readl(sport, USR1) & USR1_RTSS; usr1 = imx_uart_readl(sport, USR1) & USR1_RTSS;
uart_handle_cts_change(&sport->port, !!usr1); uart_handle_cts_change(&sport->port, usr1);
wake_up_interruptible(&sport->port.state->port.delta_msr_wait); wake_up_interruptible(&sport->port.state->port.delta_msr_wait);
return IRQ_HANDLED; return IRQ_HANDLED;
......
...@@ -247,7 +247,7 @@ static int max3100_handlerx(struct max3100_port *s, u16 rx) ...@@ -247,7 +247,7 @@ static int max3100_handlerx(struct max3100_port *s, u16 rx)
cts = (rx & MAX3100_CTS) > 0; cts = (rx & MAX3100_CTS) > 0;
if (s->cts != cts) { if (s->cts != cts) {
s->cts = cts; s->cts = cts;
uart_handle_cts_change(&s->port, cts ? TIOCM_CTS : 0); uart_handle_cts_change(&s->port, cts);
} }
return ret; return ret;
......
...@@ -819,8 +819,7 @@ static irqreturn_t max310x_port_irq(struct max310x_port *s, int portno) ...@@ -819,8 +819,7 @@ static irqreturn_t max310x_port_irq(struct max310x_port *s, int portno)
if (ists & MAX310X_IRQ_CTS_BIT) { if (ists & MAX310X_IRQ_CTS_BIT) {
lsr = max310x_port_read(port, MAX310X_LSR_IRQSTS_REG); lsr = max310x_port_read(port, MAX310X_LSR_IRQSTS_REG);
uart_handle_cts_change(port, uart_handle_cts_change(port, lsr & MAX310X_LSR_CTS_BIT);
!!(lsr & MAX310X_LSR_CTS_BIT));
} }
if (rxlen) if (rxlen)
max310x_handle_rx(port, rxlen); max310x_handle_rx(port, rxlen);
......
...@@ -3287,11 +3287,11 @@ EXPORT_SYMBOL_GPL(uart_handle_dcd_change); ...@@ -3287,11 +3287,11 @@ EXPORT_SYMBOL_GPL(uart_handle_dcd_change);
/** /**
* uart_handle_cts_change - handle a change of clear-to-send state * uart_handle_cts_change - handle a change of clear-to-send state
* @uport: uart_port structure for the open port * @uport: uart_port structure for the open port
* @status: new clear to send status, nonzero if active * @active: new clear-to-send status
* *
* Caller must hold uport->lock. * Caller must hold uport->lock.
*/ */
void uart_handle_cts_change(struct uart_port *uport, unsigned int status) void uart_handle_cts_change(struct uart_port *uport, bool active)
{ {
lockdep_assert_held_once(&uport->lock); lockdep_assert_held_once(&uport->lock);
...@@ -3299,13 +3299,13 @@ void uart_handle_cts_change(struct uart_port *uport, unsigned int status) ...@@ -3299,13 +3299,13 @@ void uart_handle_cts_change(struct uart_port *uport, unsigned int status)
if (uart_softcts_mode(uport)) { if (uart_softcts_mode(uport)) {
if (uport->hw_stopped) { if (uport->hw_stopped) {
if (status) { if (active) {
uport->hw_stopped = 0; uport->hw_stopped = 0;
uport->ops->start_tx(uport); uport->ops->start_tx(uport);
uart_write_wakeup(uport); uart_write_wakeup(uport);
} }
} else { } else {
if (!status) { if (!active) {
uport->hw_stopped = 1; uport->hw_stopped = 1;
uport->ops->stop_tx(uport); uport->ops->stop_tx(uport);
} }
......
...@@ -898,8 +898,7 @@ static inline bool uart_softcts_mode(struct uart_port *uport) ...@@ -898,8 +898,7 @@ static inline bool uart_softcts_mode(struct uart_port *uport)
*/ */
extern void uart_handle_dcd_change(struct uart_port *uport, bool active); extern void uart_handle_dcd_change(struct uart_port *uport, bool active);
extern void uart_handle_cts_change(struct uart_port *uport, extern void uart_handle_cts_change(struct uart_port *uport, bool active);
unsigned int status);
extern void uart_insert_char(struct uart_port *port, unsigned int status, extern void uart_insert_char(struct uart_port *port, unsigned int status,
unsigned int overrun, unsigned int ch, unsigned int flag); unsigned int overrun, unsigned int ch, unsigned int flag);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment