From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: linux-serial@vger.kernel.org,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Jiri Slaby" <jirislaby@kernel.org>,
"Johan Hovold" <johan@kernel.org>,
"Samuel Iglesias Gonsálvez" <siglesias@igalia.com>,
"Rodolfo Giometti" <giometti@enneenne.com>,
linux-kernel@vger.kernel.org
Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH v2 12/13] tty: moxa: Rename dtr/rts parameters/variables to active
Date: Tue, 10 Jan 2023 14:02:25 +0200 [thread overview]
Message-ID: <20230110120226.14972-13-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20230110120226.14972-1-ilpo.jarvinen@linux.intel.com>
Use active consistently for naming parameters and variables.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
drivers/tty/moxa.c | 52 +++++++++++++++++++++++-----------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index 98e180f3a4ec..c2d717e64557 100644
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -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, int *dtrState, int *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 (0: off, 1: on)
- * bool rtsState : RTS output state (0: off, 1: on)
+ * 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);
--
2.30.2
next prev parent reply other threads:[~2023-01-10 12:06 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-10 12:02 [PATCH v2 00/13] tty/serial: bool conversions and cleanups Ilpo Järvinen
2023-01-10 12:02 ` [PATCH v2 01/13] tty: Cleanup tty_port_set_initialized() bool parameter Ilpo Järvinen
2023-01-10 12:02 ` [PATCH v2 02/13] tty: Cleamup tty_port_set_suspended() " Ilpo Järvinen
2023-01-10 12:02 ` [PATCH v2 03/13] tty: Cleanup tty_port_set_active() " Ilpo Järvinen
2023-01-10 12:02 ` [PATCH v2 04/13] tty: moxa: Make local var storing tty_port_initialized() bool Ilpo Järvinen
2023-01-10 12:02 ` [PATCH v2 05/13] serial: Convert uart_{,port_}startup() init_hw param to bool Ilpo Järvinen
2023-01-11 5:53 ` Jiri Slaby
2023-01-10 12:02 ` [PATCH v2 06/13] tty: Convert ->carrier_raised() and callchains " Ilpo Järvinen
2023-01-10 12:02 ` [PATCH v2 07/13] tty: Convert ->dtr_rts() to take bool argument Ilpo Järvinen
2023-01-10 12:02 ` [PATCH v2 08/13] tty/serial: Make ->dcd_change()+uart_handle_dcd_change() status bool active Ilpo Järvinen
2023-01-10 12:02 ` [PATCH v2 09/13] serial: Make uart_handle_cts_change() status param " Ilpo Järvinen
2023-01-11 5:54 ` Jiri Slaby
2023-01-10 12:02 ` [PATCH v2 10/13] tty: Return bool from tty_termios_hw_change() Ilpo Järvinen
2023-01-11 5:55 ` Jiri Slaby
2023-01-10 12:02 ` [PATCH v2 11/13] tty/serial: Call ->dtr_rts() parameter active consistently Ilpo Järvinen
2023-01-11 5:56 ` Jiri Slaby
2023-01-10 12:02 ` Ilpo Järvinen [this message]
2023-01-11 5:59 ` [PATCH v2 12/13] tty: moxa: Rename dtr/rts parameters/variables to active Jiri Slaby
2023-01-10 12:02 ` [PATCH v2 13/13] usb/serial: " Ilpo Järvinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230110120226.14972-13-ilpo.jarvinen@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=giometti@enneenne.com \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=siglesias@igalia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox