From nobody Fri Dec 19 19:18:14 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 901E7C3DA78 for ; Tue, 17 Jan 2023 09:14:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232611AbjAQJOp (ORCPT ); Tue, 17 Jan 2023 04:14:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236640AbjAQJOC (ORCPT ); Tue, 17 Jan 2023 04:14:02 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 350D430E81; Tue, 17 Jan 2023 01:06:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673946410; x=1705482410; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=azs8MhAXaT8ciQ/+X9QDrSPGZ0tpeX4mV+5vi33IK0c=; b=bXOrJfYaWCQE/sKTUhy39jWzHflFSqT3rzoieWyH79tR8++byqWQxzue RLLog7+zGrmg+3c23TUAczEfIjIsuYh60XPY3tnJ82KZk96kfHLZ0j+eK +P26TF8YcW7bzbnpdiJM86tZ5C5togUKhzVmB9f64SL+7arYwqHho0eV2 SWI6yT96sn1g6w3iFIS84ydY6472INABF616EoU7Gpk8L/zhS3IEoV6cB 8TrXFerkYaAUkJ1XrM0CK+OCxuuFPWjizsdZi+cqnP6PVnOQpAlrlOdoE uGKJICy2NPHKcDKU6bZLYymguBQD9qyeQrcnoo8me0ZZADiFY29vC/rAk g==; X-IronPort-AV: E=McAfee;i="6500,9779,10592"; a="324701202" X-IronPort-AV: E=Sophos;i="5.97,222,1669104000"; d="scan'208";a="324701202" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2023 01:05:49 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10592"; a="783174374" X-IronPort-AV: E=Sophos;i="5.97,222,1669104000"; d="scan'208";a="783174374" Received: from tronach-mobl1.ger.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.252.40.3]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2023 01:05:44 -0800 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= To: linux-serial@vger.kernel.org, Greg Kroah-Hartman , Jiri Slaby , Rodolfo Giometti , Ulf Hansson , Johan Hovold , Samuel Iglesias Gonsalvez , linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Subject: [PATCH v4 12/12] tty: moxa: Rename dtr/rts parameters/variables to active Date: Tue, 17 Jan 2023 11:03:58 +0200 Message-Id: <20230117090358.4796-13-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230117090358.4796-1-ilpo.jarvinen@linux.intel.com> References: <20230117090358.4796-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use active consistently for naming parameters and variables. Reviewed-by: Jiri Slaby Signed-off-by: Ilpo J=C3=A4rvinen --- 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 9be3d585d5a9..42fa4c878b2e 100644 --- a/drivers/tty/moxa.c +++ b/drivers/tty/moxa.c @@ -1443,10 +1443,10 @@ static bool moxa_carrier_raised(struct tty_port *po= rt) return dcd; } =20 -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 =3D container_of(port, struct moxa_port, port); - MoxaPortLineCtrl(ch, onoff, onoff); + MoxaPortLineCtrl(ch, active, active); } =20 =20 @@ -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 =3D tty->driver_data; - bool dtr, rts; + bool dtr_active, rts_active; int flag =3D 0; int status; =20 - MoxaPortGetLineOut(ch, &dtr, &rts); - if (dtr) + MoxaPortGetLineOut(ch, &dtr_active, &rts_active); + if (dtr_active) flag |=3D TIOCM_DTR; - if (rts) + if (rts_active) flag |=3D TIOCM_RTS; status =3D 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; =20 mutex_lock(&moxa_openlock); ch =3D tty->driver_data; @@ -1589,16 +1589,16 @@ static int moxa_tiocmset(struct tty_struct *tty, return -EINVAL; } =20 - MoxaPortGetLineOut(ch, &dtr, &rts); + MoxaPortGetLineOut(ch, &dtr_active, &rts_active); if (set & TIOCM_RTS) - rts =3D true; + rts_active =3D true; if (set & TIOCM_DTR) - dtr =3D true; + dtr_active =3D true; if (clear & TIOCM_RTS) - rts =3D false; + rts_active =3D false; if (clear & TIOCM_DTR) - dtr =3D false; - MoxaPortLineCtrl(ch, dtr, rts); + dtr_active =3D false; + MoxaPortLineCtrl(ch, dtr_active, rts_active); mutex_unlock(&moxa_openlock); return 0; } @@ -1881,10 +1881,10 @@ static void MoxaPortFlushData(struct moxa_port *por= t, 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 D= TR + * bool * dtr_active : pointer to bool to receive the current D= TR * state. (if NULL, this function will not * write to this address) - * bool * rtsState : pointer to bool to receive the current R= TS + * bool * rts_active : pointer to bool to receive the current R= TS * 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; } =20 -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 =3D port->lineCtrl & DTR_ON; - if (rtsState) - *rtsState =3D port->lineCtrl & RTS_ON; + if (dtr_active) + *dtr_active =3D port->lineCtrl & DTR_ON; + if (rts_active) + *rts_active =3D port->lineCtrl & RTS_ON; =20 return 0; } =20 -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 =3D 0; =20 - if (dtr) + if (dtr_active) mode |=3D DTR_ON; - if (rts) + if (rts_active) mode |=3D RTS_ON; port->lineCtrl =3D mode; moxafunc(port->tableAddr, FC_LineControl, mode); --=20 2.30.2