Skip to contentSkip to conversation

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

PATCH In review Pan Xinhui 4 participants 4 messages Jan 5, 2016 – Feb 7, 2016 TTY layer and serial drivers

lore
Share & tools
lore

Pan Xinhui

author
#0 lore raw

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

From: Pan Xinhui <[email protected]>

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]>

---
change from V1:
lock is also held for the if()

---
 drivers/tty/n_gsm.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/tty/n_gsm.c +5 -8
index 9aff371..697b31e 100644
@@ -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. */
Signature · 1 line
1.9.1
maintainer
#2 lore raw
In reply to Pan Xinhui
Quoted 6 lines · Pan Xinhui

From: Pan Xinhui <[email protected]>

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().

Quoted 8 lines
Signed-off-by Pan Xinhui <[email protected]>
Reviewed-by Alan Cox <[email protected]>

---
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 tty-next branch of the tty.git tree :(

#3 lore raw

hi, Greg
thanks for your reply.

Quoted 16 lines · Greg Kroah-Hartman
Quoted 6 lines · Pan Xinhui

From: Pan Xinhui <[email protected]>

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().

Quoted 8 lines
Signed-off-by Pan Xinhui <[email protected]>
Reviewed-by Alan Cox <[email protected]>

---
change from V1:
lock is also held for the if()

---
  drivers/tty/n_gsm.c | 13 +++++--------
  1 file changed, 5 insertions(+), 8 deletions(-)
Quoted 2 lines

Doesn't apply to my tty-next branch of the tty.git tree :(

Sorry for not telling you one important information.
This patch is on top of Jiri's patch, "TTY: n_gsm, fix false positive WARN_ON", see https://patchwork.kernel.org/patch/7692181/
Looks like Jiri's patch is still not in your tree.

Hi, Jiri
Could I make a new patch on top of the mainline's codes first then you prepare your patch on top of mine?
I will appreciate that if you have a better solution :)

thanks
xinhui