* [PATCH V2 RESEND] tty/n_gsm.c: use gsm->num to remove mux itself from gsm_mux[]
@ 2016-07-14 8:37 xinhui
2016-08-31 14:01 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: xinhui @ 2016-07-14 8:37 UTC (permalink / raw)
To: linux-kernel; +Cc: Jiri Slaby, yanmin_zhang, alan, gregkh
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH V2 RESEND] tty/n_gsm.c: use gsm->num to remove mux itself from gsm_mux[]
2016-07-14 8:37 [PATCH V2 RESEND] tty/n_gsm.c: use gsm->num to remove mux itself from gsm_mux[] xinhui
@ 2016-08-31 14:01 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2016-08-31 14:01 UTC (permalink / raw)
To: xinhui; +Cc: linux-kernel, Jiri Slaby, yanmin_zhang, alan
On Thu, Jul 14, 2016 at 04:37:51PM +0800, xinhui wrote:
> 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(-)
Doesn't apply to my tree :(
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-31 14:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-14 8:37 [PATCH V2 RESEND] tty/n_gsm.c: use gsm->num to remove mux itself from gsm_mux[] xinhui
2016-08-31 14:01 ` Greg KH
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).