Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753910AbbK0DnP (ORCPT ); Thu, 26 Nov 2015 22:43:15 -0500 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:52984 "EHLO e23smtp07.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753757AbbK0DnM (ORCPT ); Thu, 26 Nov 2015 22:43:12 -0500 X-IBM-Helo: d23dlp01.au.ibm.com X-IBM-MailFrom: xinhui.pan@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org Message-ID: <5657D0CF.9060801@linux.vnet.ibm.com> Date: Fri, 27 Nov 2015 11:41:03 +0800 From: 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: Jiri Slaby , Greg Kroah-Hartman , yanmin_zhang@linux.intel.com, mnipxh@163.com, jin.xiao@intel.com Subject: [PATCH] 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: 15112703-0025-0000-0000-000002808DF2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1307 Lines: 45 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/