From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752306AbcAEHoB (ORCPT ); Tue, 5 Jan 2016 02:44:01 -0500 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:54725 "EHLO e23smtp09.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751978AbcAEHn4 (ORCPT ); Tue, 5 Jan 2016 02:43:56 -0500 X-IBM-Helo: d23dlp02.au.ibm.com X-IBM-MailFrom: xinhui@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org Message-ID: <568B73FC.7020407@linux.vnet.ibm.com> Date: Tue, 05 Jan 2016 15:42:52 +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 , mnipxh@163.com, yanmin_zhang@linux.intel.com, alan@linux.intel.com Subject: [PATCH V2] 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: 16010507-0033-0000-0000-000002AE1F38 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- change from V1: lock is also held for the if() --- drivers/tty/n_gsm.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index 9aff371..697b31e 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -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. */ -- 1.9.1