mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

tty: moxa: Rename dtr/rts parameters/variables to active 

Use active consistently for naming parameters and variables.

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-13-ilpo.jarvinen@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ilpo Järvinen 2023-01-17 11:03:58 +02:00 committed by Greg Kroah-Hartman
parent 5701cb8bf5
commit 2d762dab66
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/tty/moxa.c
View File

@ -1443,10 +1443,10 @@ static bool moxa_carrier_raised(struct tty_port *port)
return dcd;
}
static void moxa_dtr_rts(struct tty_port *port, bool onoff)
static void moxa_dtr_rts(struct tty_port *port, bool active)
{
struct moxa_port *ch = container_of(port, struct moxa_port, port);
MoxaPortLineCtrl(ch, onoff, onoff);
MoxaPortLineCtrl(ch, active, active);
}
@ -1557,14 +1557,14 @@ static unsigned int moxa_chars_in_buffer(struct tty_struct *tty)
static int moxa_tiocmget(struct tty_struct *tty)
{
struct moxa_port *ch = tty->driver_data;
bool dtr, rts;
bool dtr_active, rts_active;
int flag = 0;
int status;
MoxaPortGetLineOut(ch, &dtr, &rts);
if (dtr)
MoxaPortGetLineOut(ch, &dtr_active, &rts_active);
if (dtr_active)
flag |= TIOCM_DTR;
if (rts)
if (rts_active)
flag |= TIOCM_RTS;
status = MoxaPortLineStatus(ch);
if (status & 1)
@ -1579,8 +1579,8 @@ static int moxa_tiocmget(struct tty_struct *tty)
static int moxa_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
bool dtr_active, rts_active;
struct moxa_port *ch;
bool dtr, rts;
mutex_lock(&moxa_openlock);
ch = tty->driver_data;
@ -1589,16 +1589,16 @@ static int moxa_tiocmset(struct tty_struct *tty,
return -EINVAL;
}
MoxaPortGetLineOut(ch, &dtr, &rts);
MoxaPortGetLineOut(ch, &dtr_active, &rts_active);
if (set & TIOCM_RTS)
rts = true;
rts_active = true;
if (set & TIOCM_DTR)
dtr = true;
dtr_active = true;
if (clear & TIOCM_RTS)
rts = false;
rts_active = false;
if (clear & TIOCM_DTR)
dtr = false;
MoxaPortLineCtrl(ch, dtr, rts);
dtr_active = false;
MoxaPortLineCtrl(ch, dtr_active, rts_active);
mutex_unlock(&moxa_openlock);
return 0;
}
@ -1881,10 +1881,10 @@ static void MoxaPortFlushData(struct moxa_port *port, int mode)
* Syntax:
* int MoxaPortGetLineOut(int port, bool *dtrState, bool *rtsState);
* int port : port number (0 - 127)
* bool * dtrState : pointer to bool to receive the current DTR
* bool * dtr_active : pointer to bool to receive the current DTR
* state. (if NULL, this function will not
* write to this address)
* bool * rtsState : pointer to bool to receive the current RTS
* bool * rts_active : pointer to bool to receive the current RTS
* state. (if NULL, this function will not
* write to this address)
*
@ -1896,8 +1896,8 @@ static void MoxaPortFlushData(struct moxa_port *port, int mode)
* Syntax:
* void MoxaPortLineCtrl(int port, bool dtrState, bool rtsState);
* int port : port number (0 - 127)
* bool dtrState : DTR output state
* bool rtsState : RTS output state
* bool dtr_active : DTR output state
* bool rts_active : RTS output state
*
*
* Function 15: Setting the flow control of this port.
@ -2105,24 +2105,24 @@ static int MoxaPortSetTermio(struct moxa_port *port, struct ktermios *termio,
return baud;
}
static int MoxaPortGetLineOut(struct moxa_port *port, bool *dtrState,
bool *rtsState)
static int MoxaPortGetLineOut(struct moxa_port *port, bool *dtr_active,
bool *rts_active)
{
if (dtrState)
*dtrState = port->lineCtrl & DTR_ON;
if (rtsState)
*rtsState = port->lineCtrl & RTS_ON;
if (dtr_active)
*dtr_active = port->lineCtrl & DTR_ON;
if (rts_active)
*rts_active = port->lineCtrl & RTS_ON;
return 0;
}
static void MoxaPortLineCtrl(struct moxa_port *port, bool dtr, bool rts)
static void MoxaPortLineCtrl(struct moxa_port *port, bool dtr_active, bool rts_active)
{
u8 mode = 0;
if (dtr)
if (dtr_active)
mode |= DTR_ON;
if (rts)
if (rts_active)
mode |= RTS_ON;
port->lineCtrl = mode;
moxafunc(port->tableAddr, FC_LineControl, mode);