From: xinhui <xinhui.pan@linux.vnet.ibm.com>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Jiri Slaby <jslaby@suse.com>,
yanmin_zhang@linux.intel.com, alan@linux.intel.com,
gregkh@linuxfoundation.org
Subject: [PATCH V2 RESEND] tty/n_gsm.c: use gsm->num to remove mux itself from gsm_mux[]
Date: Thu, 14 Jul 2016 16:37:51 +0800 [thread overview]
Message-ID: <57874F5F.5050000@linux.vnet.ibm.com> (raw)
From: Pan Xinhui <xinhui.pan@linux.vnet.ibm.com>
There is one filed gsm->num to store mux's index of gsm_mux[]. So use
gsm->num to remove itself from gsm_mux[] instead of the for-loop
traverse in gsm_cleanup_mux().
Signed-off-by: Pan Xinhui <xinhui.pan@linux.vnet.ibm.com>
Reviewed-by: Alan Cox <alan@linux.intel.com>
---
change from V1:
lock is also held for the if()
---
drivers/tty/n_gsm.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 9aff371..697b31e 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -2038,16 +2038,13 @@ static void gsm_cleanup_mux(struct gsm_mux *gsm)
gsm->dead = 1;
spin_lock(&gsm_mux_lock);
- for (i = 0; i < MAX_MUX; i++) {
- if (gsm_mux[i] == gsm) {
- gsm_mux[i] = NULL;
- break;
- }
- }
- spin_unlock(&gsm_mux_lock);
/* open failed before registering => nothing to do */
- if (i == MAX_MUX)
+ if (gsm_mux[gsm->num] != gsm) {
+ spin_unlock(&gsm_mux_lock);
return;
+ }
+ gsm_mux[gsm->num] = NULL;
+ spin_unlock(&gsm_mux_lock);
/* In theory disconnecting DLCI 0 is sufficient but for some
modems this is apparently not the case. */
--
1.9.1
next reply other threads:[~2016-07-14 8:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-14 8:37 xinhui [this message]
2016-08-31 14:01 ` [PATCH V2 RESEND] tty/n_gsm.c: use gsm->num to remove mux itself from gsm_mux[] Greg KH
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=57874F5F.5050000@linux.vnet.ibm.com \
--to=xinhui.pan@linux.vnet.ibm.com \
--cc=alan@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=yanmin_zhang@linux.intel.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;
as well as URLs for NNTP newsgroup(s).