mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "D. Starke" <daniel.starke@siemens.com>
To: linux-serial@vger.kernel.org, gregkh@linuxfoundation.org,
	jirislaby@kernel.org, ilpo.jarvinen@linux.intel.com
Cc: linux-kernel@vger.kernel.org, Daniel Starke <daniel.starke@siemens.com>
Subject: [PATCH 9/9] tty: n_gsm: cleanup gsm_control_command and gsm_control_reply
Date: Wed,  5 Apr 2023 07:47:30 +0200	[thread overview]
Message-ID: <20230405054730.3850-9-daniel.starke@siemens.com> (raw)
In-Reply-To: <20230405054730.3850-1-daniel.starke@siemens.com>

From: Daniel Starke <daniel.starke@siemens.com>

There are multiple places in gsm_control_command and gsm_control_reply that
derive the specific DLCI handle directly out of the DLCI table in gsm.

Add a local variable which holds this handle and use it instead to improve
code readability.

Signed-off-by: Daniel Starke <daniel.starke@siemens.com>
---
 drivers/tty/n_gsm.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 61f9825fde3c..87720ebc38d7 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -1454,16 +1454,17 @@ static int gsm_control_command(struct gsm_mux *gsm, int cmd, const u8 *data,
 			       int dlen)
 {
 	struct gsm_msg *msg;
+	struct gsm_dlci *dlci = gsm->dlci[0];
 
-	msg = gsm_data_alloc(gsm, 0, dlen + 2, gsm->dlci[0]->ftype);
+	msg = gsm_data_alloc(gsm, 0, dlen + 2, dlci->ftype);
 	if (msg == NULL)
 		return -ENOMEM;
 
 	msg->data[0] = (cmd << 1) | CR | EA;	/* Set C/R */
 	msg->data[1] = (dlen << 1) | EA;
 	memcpy(msg->data + 2, data, dlen);
-	gsm_data_queue(gsm->dlci[0], msg);
-	gsm->dlci[0]->tx += dlen;
+	gsm_data_queue(dlci, msg);
+	dlci->tx += dlen;
 
 	return 0;
 }
@@ -1482,15 +1483,16 @@ static void gsm_control_reply(struct gsm_mux *gsm, int cmd, const u8 *data,
 					int dlen)
 {
 	struct gsm_msg *msg;
+	struct gsm_dlci *dlci = gsm->dlci[0];
 
-	msg = gsm_data_alloc(gsm, 0, dlen + 2, gsm->dlci[0]->ftype);
+	msg = gsm_data_alloc(gsm, 0, dlen + 2, dlci->ftype);
 	if (msg == NULL)
 		return;
 	msg->data[0] = (cmd & 0xFE) << 1 | EA;	/* Clear C/R */
 	msg->data[1] = (dlen << 1) | EA;
 	memcpy(msg->data + 2, data, dlen);
-	gsm_data_queue(gsm->dlci[0], msg);
-	gsm->dlci[0]->tx += dlen;
+	gsm_data_queue(dlci, msg);
+	dlci->tx += dlen;
 }
 
 /**
-- 
2.34.1


  parent reply	other threads:[~2023-04-05  5:50 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-05  5:47 [PATCH 1/9] tty: n_gsm: fix redundant assignment of gsm->encoding D. Starke
2023-04-05  5:47 ` [PATCH 2/9] tty: n_gsm: add restart parameter to DLC specific ioctl config D. Starke
2023-04-05  8:15   ` Ilpo Järvinen
2023-04-06  5:17     ` Starke, Daniel
2023-04-05  5:47 ` [PATCH 3/9] tty: n_gsm: add missing description to gsm_config D. Starke
2023-04-05  8:18   ` Ilpo Järvinen
2023-04-06  5:26     ` Starke, Daniel
2023-04-05  5:47 ` [PATCH 4/9] tty: n_gsm: fix unneeded initialization of ret in gsm_dlci_config D. Starke
2023-04-05  8:23   ` Ilpo Järvinen
2023-04-06  5:31     ` Starke, Daniel
2023-04-05  5:47 ` [PATCH 5/9] tty: n_gsm: add open_error counter to gsm_mux D. Starke
2023-04-05  8:41   ` Ilpo Järvinen
2023-04-06  5:42     ` Starke, Daniel
2023-04-05  5:47 ` [PATCH 6/9] tty: n_gsm: increase malformed counter for malformed control frames D. Starke
2023-04-05  8:44   ` Ilpo Järvinen
2023-04-06  5:45     ` Starke, Daniel
2023-04-05  5:47 ` [PATCH 7/9] tty: n_gsm: increase gsm_mux unsupported counted where appropriate D. Starke
2023-04-05  9:00   ` Ilpo Järvinen
2023-04-06  5:57     ` Starke, Daniel
2023-04-05  5:47 ` [PATCH 8/9] tty: n_gsm: add DLCI specific rx/tx statistics D. Starke
2023-04-05  9:13   ` Ilpo Järvinen
2023-04-06  6:02     ` Starke, Daniel
2023-04-05  5:47 ` D. Starke [this message]
2023-04-05  9:15   ` [PATCH 9/9] tty: n_gsm: cleanup gsm_control_command and gsm_control_reply Ilpo Järvinen
2023-04-06  6:04     ` Starke, Daniel
2023-04-05  8:16 ` [PATCH 1/9] tty: n_gsm: fix redundant assignment of gsm->encoding 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=20230405054730.3850-9-daniel.starke@siemens.com \
    --to=daniel.starke@siemens.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=ilpo.jarvinen@linux.intel.com \
    --cc=jirislaby@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    /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

all inboxes | Powered by JetHome®