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 v2 8/9] tty: n_gsm: cleanup gsm_control_command and gsm_control_reply
Date: Thu, 20 Apr 2023 10:50:16 +0200 [thread overview]
Message-ID: <20230420085017.7314-8-daniel.starke@siemens.com> (raw)
In-Reply-To: <20230420085017.7314-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 | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
v1 -> v2:
Moved from patch 9 to 8 as suggested in the review.
Link: https://lore.kernel.org/all/AS4PR10MB58953283D47928E265313660E0919@AS4PR10MB5895.EURPRD10.PROD.OUTLOOK.COM/
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index ce06cbbe79af..bd6bddb185b9 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -1450,15 +1450,16 @@ 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_data_queue(dlci, msg);
return 0;
}
@@ -1477,14 +1478,15 @@ 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_data_queue(dlci, msg);
}
/**
--
2.34.1
next prev parent reply other threads:[~2023-04-20 8:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-20 8:50 [PATCH v2 1/9] tty: n_gsm: fix redundant assignment of gsm->encoding D. Starke
2023-04-20 8:50 ` [PATCH v2 2/9] tty: n_gsm: add restart parameter to DLC specific ioctl config D. Starke
2023-04-20 8:50 ` [PATCH v2 3/9] tty: n_gsm: add missing description to gsm_config D. Starke
2023-04-20 9:08 ` Jiri Slaby
2023-04-20 11:11 ` Greg KH
2023-04-20 8:50 ` [PATCH v2 4/9] tty: n_gsm: remove unneeded initialization of ret in gsm_dlci_config D. Starke
2023-04-20 8:50 ` [PATCH v2 5/9] tty: n_gsm: add open_error counter to gsm_mux D. Starke
2023-04-20 8:50 ` [PATCH v2 6/9] tty: n_gsm: increase malformed counter for malformed control frames D. Starke
2023-04-20 8:50 ` [PATCH v2 7/9] tty: n_gsm: increase gsm_mux unsupported counted where appropriate D. Starke
2023-04-20 8:50 ` D. Starke [this message]
2023-04-20 8:50 ` [PATCH v2 9/9] tty: n_gsm: add DLCI specific rx/tx statistics D. Starke
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=20230420085017.7314-8-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®