hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tty/serial: Make ->dcd_change()+uart_handle_dcd_change() status bool active

Browse Source 
[ Upstream commit 0388a152fc5544be82e736343496f99c4eef8d62 ]

Convert status parameter for ->dcd_change() and
uart_handle_dcd_change() to bool which matches to how the parameter is
used.

Rename status to active to better describe what the parameter means.

Acked-by: Rodolfo Giometti <giometti@enneenne.com>
Reviewed-by: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20230117090358.4796-9-ilpo.jarvinen@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: 40d7903386df ("serial: imx: Update mctrl old_status on RTSD interrupt")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ilpo Järvinen 2023-01-17 11:03:54 +02:00 committed by Greg Kroah-Hartman
parent 85ca88f931
commit 376d15bad7
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pps/clients/pps-ldisc.c
View File

@ -13,7 +13,7 @@
#include <linux/pps_kernel.h> #include <linux/pps_kernel.h>
#include <linux/bug.h> #include <linux/bug.h>
static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status) static void pps_tty_dcd_change(struct tty_struct *tty, bool active)
{ {
struct pps_device *pps; struct pps_device *pps;
struct pps_event_time ts; struct pps_event_time ts;
@ -29,11 +29,11 @@ static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status)
return; return;
/* Now do the PPS event report */ /* Now do the PPS event report */
pps_event(pps, &ts, status ? PPS_CAPTUREASSERT : pps_event(pps, &ts, active ? PPS_CAPTUREASSERT :
PPS_CAPTURECLEAR, NULL); PPS_CAPTURECLEAR, NULL);
dev_dbg(pps->dev, "PPS %s at %lu\n", dev_dbg(pps->dev, "PPS %s at %lu\n",
status ? "assert" : "clear", jiffies); active ? "assert" : "clear", jiffies);
} }
static int (*alias_n_tty_open)(struct tty_struct *tty); static int (*alias_n_tty_open)(struct tty_struct *tty);

8
drivers/tty/serial/serial_core.c
View File

@ -3290,11 +3290,11 @@ EXPORT_SYMBOL(uart_match_port);
/** /**
* uart_handle_dcd_change - handle a change of carrier detect state * uart_handle_dcd_change - handle a change of carrier detect state
* @uport: uart_port structure for the open port * @uport: uart_port structure for the open port
* @status: new carrier detect status, nonzero if active * @active: new carrier detect status
* *
* Caller must hold uport->lock. * Caller must hold uport->lock.
*/ */
void uart_handle_dcd_change(struct uart_port *uport, unsigned int status) void uart_handle_dcd_change(struct uart_port *uport, bool active)
{ {
struct tty_port *port = &uport->state->port; struct tty_port *port = &uport->state->port;
struct tty_struct *tty = port->tty; struct tty_struct *tty = port->tty;
@ -3306,7 +3306,7 @@ void uart_handle_dcd_change(struct uart_port *uport, unsigned int status)
ld = tty_ldisc_ref(tty); ld = tty_ldisc_ref(tty);
if (ld) { if (ld) {
if (ld->ops->dcd_change) if (ld->ops->dcd_change)
ld->ops->dcd_change(tty, status); ld->ops->dcd_change(tty, active);
tty_ldisc_deref(ld); tty_ldisc_deref(ld);
} }
} }
@ -3314,7 +3314,7 @@ void uart_handle_dcd_change(struct uart_port *uport, unsigned int status)
uport->icount.dcd++; uport->icount.dcd++;
if (uart_dcd_enabled(uport)) { if (uart_dcd_enabled(uport)) {
if (status) if (active)
wake_up_interruptible(&port->open_wait); wake_up_interruptible(&port->open_wait);
else if (tty) else if (tty)
tty_hangup(tty); tty_hangup(tty);

8
drivers/tty/serial/sunhv.c
View File

@ -89,10 +89,10 @@ static int receive_chars_getchar(struct uart_port *port)
if (c == CON_HUP) { if (c == CON_HUP) {
hung_up = 1; hung_up = 1;
uart_handle_dcd_change(port, 0); uart_handle_dcd_change(port, false);
} else if (hung_up) { } else if (hung_up) {
hung_up = 0; hung_up = 0;
uart_handle_dcd_change(port, 1); uart_handle_dcd_change(port, true);
} }
if (port->state == NULL) { if (port->state == NULL) {
@ -135,7 +135,7 @@ static int receive_chars_read(struct uart_port *port)
bytes_read = 1; bytes_read = 1;
} else if (stat == CON_HUP) { } else if (stat == CON_HUP) {
hung_up = 1; hung_up = 1;
uart_handle_dcd_change(port, 0); uart_handle_dcd_change(port, false);
continue; continue;
} else { } else {
/* HV_EWOULDBLOCK, etc. */ /* HV_EWOULDBLOCK, etc. */
@ -145,7 +145,7 @@ static int receive_chars_read(struct uart_port *port)
if (hung_up) { if (hung_up) {
hung_up = 0; hung_up = 0;
uart_handle_dcd_change(port, 1); uart_handle_dcd_change(port, true);
} }
if (port->sysrq != 0 && *con_read_page) { if (port->sysrq != 0 && *con_read_page) {

3
include/linux/serial_core.h
View File

@ -890,8 +890,7 @@ static inline bool uart_softcts_mode(struct uart_port *uport)
* The following are helper functions for the low level drivers. * The following are helper functions for the low level drivers.
*/ */
extern void uart_handle_dcd_change(struct uart_port *uport, extern void uart_handle_dcd_change(struct uart_port *uport, bool active);
unsigned int status);
extern void uart_handle_cts_change(struct uart_port *uport, extern void uart_handle_cts_change(struct uart_port *uport,
unsigned int status); unsigned int status);

4
include/linux/tty_ldisc.h
View File

@ -170,7 +170,7 @@ int ldsem_down_write_nested(struct ld_semaphore *sem, int subclass,
* send, please arise a tasklet or workqueue to do the real data transfer. * send, please arise a tasklet or workqueue to do the real data transfer.
* Do not send data in this hook, it may lead to a deadlock. * Do not send data in this hook, it may lead to a deadlock.
* *
* @dcd_change: [DRV] ``void ()(struct tty_struct *tty, unsigned int status)`` * @dcd_change: [DRV] ``void ()(struct tty_struct *tty, bool active)``
* *
* Tells the discipline that the DCD pin has changed its status. Used * Tells the discipline that the DCD pin has changed its status. Used
* exclusively by the %N_PPS (Pulse-Per-Second) line discipline. * exclusively by the %N_PPS (Pulse-Per-Second) line discipline.
@ -238,7 +238,7 @@ struct tty_ldisc_ops {
void (*receive_buf)(struct tty_struct *tty, const unsigned char *cp, void (*receive_buf)(struct tty_struct *tty, const unsigned char *cp,
const char *fp, int count); const char *fp, int count);
void (*write_wakeup)(struct tty_struct *tty); void (*write_wakeup)(struct tty_struct *tty);
void (*dcd_change)(struct tty_struct *tty, unsigned int status); void (*dcd_change)(struct tty_struct *tty, bool active);
int (*receive_buf2)(struct tty_struct *tty, const unsigned char *cp, int (*receive_buf2)(struct tty_struct *tty, const unsigned char *cp,
const char *fp, int count); const char *fp, int count);
void (*lookahead_buf)(struct tty_struct *tty, const unsigned char *cp, void (*lookahead_buf)(struct tty_struct *tty, const unsigned char *cp,