From patchwork Thu Apr 20 08:50:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "D. Starke" X-Patchwork-Id: 85793 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp187110vqo; Thu, 20 Apr 2023 02:08:08 -0700 (PDT) X-Google-Smtp-Source: AKy350artBBn2Vj6RlC6BFjxR8wShzlYMl1IOX8BtroENnxrBun8s5fLA6yggkU0pxv669KabHMs X-Received: by 2002:a17:90a:4989:b0:247:bdeb:594f with SMTP id d9-20020a17090a498900b00247bdeb594fmr1022222pjh.15.1681981688559; Thu, 20 Apr 2023 02:08:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681981688; cv=none; d=google.com; s=arc-20160816; b=w0KEL5u0hUo7Um5muK/XiJmyooxlOzAb39aKaCLYtptMODmWDPC3r9QO9XBormzLEe LP5G27mxoECjF6cx3KlyFdvZDE8oI/GbcRPngD7ZwFpPajoP7IAcKZgpHXvlTJVNh0Tv ZOPeefiw3OoQwB/zs0IR22E0j29KFxgqcYx1HFO0EAoSkGFekJ7+d7YtqQWvr2MmlKKA CLQ9mQnWybiD/bCXVqiNdl5wg3sUu7YOaQj0kLjJtPtXgIa/kmmEAfwgffyV/skY8Lif /WzxN3SzElxJrIVHKwmojh+2qUxlzK+XwJGcgUzvKeAl09HVt4b9qLfD0IzG7u3lzWZv Ws6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FQjnwT4CT+XNGnJ3WBAhjs5ayKF62EGFFFeFaI41i8I=; b=KPACEi/L85zUSgvBh+Uxbo/w/PRccDa6CkUEbBEkpcyjxWViDvtV06IO/dSJc+nmW9 qpccadsUloYLCOPTOPPyS4wWRs3KQbO0k/tBgf7kQbwLUlXw9O81dWBTtEgzXM4UeOVj na2LiwNWq6vwrBN2m8Ws1Bw/+8pGROLyHItkjqGrpXl6h83keDvFA4jmLBAV9Ednhcws ni5JXCKIiBIfi+LQoxgJmYjaf2dhWpbaRR+J198EztMdpz2bFgFKIpS/1pya2H6kOS9P acs0bO8TSSSd5GgTsDvONRxNxvLHCxLMqspzE61aSFGG5ICUi0dGSjDXo/0NxSWSRd8B CLhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bnvnMnlI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ob8-20020a17090b390800b002474ddc6a90si4252541pjb.125.2023.04.20.02.07.55; Thu, 20 Apr 2023 02:08:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bnvnMnlI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233691AbjDTIzG (ORCPT + 99 others); Thu, 20 Apr 2023 04:55:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233961AbjDTIxw (ORCPT ); Thu, 20 Apr 2023 04:53:52 -0400 Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net [185.136.65.225]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B586259F0 for ; Thu, 20 Apr 2023 01:52:05 -0700 (PDT) Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 202304200852024fc8247067930246d1 for ; Thu, 20 Apr 2023 10:52:02 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=daniel.starke@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=FQjnwT4CT+XNGnJ3WBAhjs5ayKF62EGFFFeFaI41i8I=; b=bnvnMnlIfut6yLSrozGMcqdaqDs/eAsmxbnwQ7Apewajc35SQNMuMn4hsGNfjX/cnX9BDj 7tut/vgImnLi21LmFJeMgGqlanpYQJ7/ksJn3oFpriwu93Rdgi0nKVQ7OY5CDSAHSgQbNS+g PnCdpiiTTu1wligw9fSVAkjjcxQu4=; From: "D. Starke" To: linux-serial@vger.kernel.org, gregkh@linuxfoundation.org, jirislaby@kernel.org, ilpo.jarvinen@linux.intel.com Cc: linux-kernel@vger.kernel.org, Daniel Starke Subject: [PATCH v2 8/9] tty: n_gsm: cleanup gsm_control_command and gsm_control_reply Date: Thu, 20 Apr 2023 10:50:16 +0200 Message-Id: <20230420085017.7314-8-daniel.starke@siemens.com> In-Reply-To: <20230420085017.7314-1-daniel.starke@siemens.com> References: <20230420085017.7314-1-daniel.starke@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-314044:519-21489:flowmailer X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763685631155017639?= X-GMAIL-MSGID: =?utf-8?q?1763685631155017639?= From: Daniel Starke There are multiple places in gsm_control_command and gsm_control_reply that derive the specific DLCI handle directly out of the DLCI table in gsm. Add a local variable which holds this handle and use it instead to improve code readability. Signed-off-by: Daniel Starke --- drivers/tty/n_gsm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) v1 -> v2: Moved from patch 9 to 8 as suggested in the review. Link: https://lore.kernel.org/all/AS4PR10MB58953283D47928E265313660E0919@AS4PR10MB5895.EURPRD10.PROD.OUTLOOK.COM/ diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index ce06cbbe79af..bd6bddb185b9 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -1450,15 +1450,16 @@ static int gsm_control_command(struct gsm_mux *gsm, int cmd, const u8 *data, int dlen) { struct gsm_msg *msg; + struct gsm_dlci *dlci = gsm->dlci[0]; - msg = gsm_data_alloc(gsm, 0, dlen + 2, gsm->dlci[0]->ftype); + msg = gsm_data_alloc(gsm, 0, dlen + 2, dlci->ftype); if (msg == NULL) return -ENOMEM; msg->data[0] = (cmd << 1) | CR | EA; /* Set C/R */ msg->data[1] = (dlen << 1) | EA; memcpy(msg->data + 2, data, dlen); - gsm_data_queue(gsm->dlci[0], msg); + gsm_data_queue(dlci, msg); return 0; } @@ -1477,14 +1478,15 @@ static void gsm_control_reply(struct gsm_mux *gsm, int cmd, const u8 *data, int dlen) { struct gsm_msg *msg; + struct gsm_dlci *dlci = gsm->dlci[0]; - msg = gsm_data_alloc(gsm, 0, dlen + 2, gsm->dlci[0]->ftype); + msg = gsm_data_alloc(gsm, 0, dlen + 2, dlci->ftype); if (msg == NULL) return; msg->data[0] = (cmd & 0xFE) << 1 | EA; /* Clear C/R */ msg->data[1] = (dlen << 1) | EA; memcpy(msg->data + 2, data, dlen); - gsm_data_queue(gsm->dlci[0], msg); + gsm_data_queue(dlci, msg); } /**