Skip to contentSkip to conversation

tty/n_gsm.c: use gsm->num to remove mux itself from gsm_mux[]

PATCH Superseded xinhui 3 participants 3 messages Nov 27, 2015 – Dec 14, 2015 TTY layer and serial drivers

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

xinhui

author
#0 lore raw

PATCH 1/1 tty/n_gsm.c: use gsm->num to remove mux itself from gsm_mux[]

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 <[email protected]>
---
 drivers/tty/n_gsm.c |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)
drivers/tty/n_gsm.c +5 -9
index 9aff371..cf28054 100644
@@ -2037,18 +2037,14 @@ 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)
 		return;
 
+	spin_lock(&gsm_mux_lock);
+	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. */
 	if (dlci) {
Signature · 1 line
1.7.1
maintainer
#1 lore raw
Quoted 5 lines · xinhui

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 <[email protected]>

Your "From:" line in the email needs to match your signed-off-by: line, please fix up your email client to do this properly so that your patches can be accepted.

thanks,

greg k-h

#2 lore raw

Hi, Greg
Thanks for your kind reply :)

Quoted 11 lines · Greg Kroah-Hartman
Quoted 5 lines · xinhui

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 <[email protected]>

Your "From:" line in the email needs to match your signed-off-by: line, please fix up your email client to do this properly so that your patches can be accepted.

I will fix it ASAP. Thank you!

thanks
xinhui

Quoted 4 lines

thanks,

greg k-h