Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752541AbbLNHIQ (ORCPT ); Mon, 14 Dec 2015 02:08:16 -0500 Received: from e28smtp05.in.ibm.com ([125.16.236.5]:41095 "EHLO e28smtp05.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751128AbbLNHIP (ORCPT ); Mon, 14 Dec 2015 02:08:15 -0500 X-IBM-Helo: d28dlp01.in.ibm.com X-IBM-MailFrom: xinhui.pan@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org Message-ID: <566E6AD3.1060003@linux.vnet.ibm.com> Date: Mon, 14 Dec 2015 15:08:03 +0800 From: Pan Xinhui User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: linux-kernel@vger.kernel.org CC: Greg Kroah-Hartman , Jiri Slaby , yanmin_zhang@linux.intel.com, mnipxh@163.com Subject: [PATCH resend ] tty/n_gsm.c: use gsm->num to remove mux itself from gsm_mux[] Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15121407-0017-0000-0000-000008FBCD99 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1357 Lines: 47 From: Pan 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 --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/