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

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

[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 <xinhui.pan@linux.vnet.ibm.com>
---
 drivers/tty/n_gsm.c |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 9aff371..cf28054 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -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) {
-- 
1.7.1

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

[Greg Kroah-Hartman]

On Fri, Nov 27, 2015 at 11:41:03AM +0800, xinhui wrote:
> 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>

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

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

[xinhui]

Hi, Greg
	Thanks for your kind reply :)

On 2015/12/13 14:47, Greg Kroah-Hartman wrote:
> On Fri, Nov 27, 2015 at 11:41:03AM +0800, xinhui wrote:
>> 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>
>
> 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
> thanks,
>
> greg k-h
>