From nobody Wed Apr 8 21:18:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7368FC38A02 for ; Fri, 28 Oct 2022 23:26:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229902AbiJ1X0U (ORCPT ); Fri, 28 Oct 2022 19:26:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229833AbiJ1X0M (ORCPT ); Fri, 28 Oct 2022 19:26:12 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6828A1DC82A for ; Fri, 28 Oct 2022 16:26:05 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id g7so10634661lfv.5 for ; Fri, 28 Oct 2022 16:26:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UklhJgGoyZGLy7w3immveIEsxPRlB+UWC/kvGVYWMME=; b=XflN1pJrFMvDtNQ0wg9hNRmYteseb1LBOr+PAnniO3oY9YRe1Npb6kfpF3GxLubpqK bPabpIptyS561e3a05MdycHZJBSE/clD79xLgM2rARfFaose6HLAolFRQsHLYldWO9bc aDpMGWc7iKBW40Jl5o7nUxjGTTO03d8434ioTgvCWlf2nauBa1ny33lTMr0c2/0aewaC 6ydISlUwSWoViB0CX1q/fvKg5GiMAg5OueTAGgcXgK1qSzPQiFsGCo/JcAty2o/9iYeC R5fAl38dKb31Jv1z/dMtweZ+6oLc+yJtKZCQPv56+WKe4ArAQxU5H4vf6sHqYx4nMN6n F2BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UklhJgGoyZGLy7w3immveIEsxPRlB+UWC/kvGVYWMME=; b=poTlK774qf/SWlzJGYM/+hlZa98bUi++t4tCP+RZVssYDEEOEeUGBoQkKM17sFuxvT xlIkrWBb9KIFKo2efV3H2Hs4G2OhPwM3joCtckLRsIEcvjryp0QGREfVCthEMqLJIrr9 kgVqznUfFZuAveZuB0dH1W8a0UzzMRQa8F1ah3cxo4LN5iv5qk3zJkOQlhu9ggsawsWc zlC3r4LvWmGF/cEDEO6LdAMF7pdHmbSYQHD05XepB/F+xb6Q0u91JqfzF3qpTWy81izQ PienUrv7nfSqWOz7VAhAp3Q1j8DGatu4zDNXS4bJIPZYmFuBS1LP8EDWf8opuUaMTjh3 3ewg== X-Gm-Message-State: ACrzQf2ySuoObgSSmAWWfEYZssvw7+HEWeWUdxRM32OoSfoJabBBzsG/ zZDbAmt2nRagb6u5GLwgtBM= X-Google-Smtp-Source: AMsMyM5i560QonZi8jQXp/cgxFjwULSLdJrUE6UMJEfXDEMeXG41LiYPqQLae5kYiWe+PUxcM597Ew== X-Received: by 2002:ac2:5dd4:0:b0:4af:fbde:bca4 with SMTP id x20-20020ac25dd4000000b004affbdebca4mr592331lfq.387.1666999563735; Fri, 28 Oct 2022 16:26:03 -0700 (PDT) Received: from elroy-temp-vm.gaiao0uenmiufjlowqgp5yxwdh.gvxx.internal.cloudapp.net ([20.240.130.248]) by smtp.googlemail.com with ESMTPSA id s2-20020a056512202200b0049aa20af00fsm7064lfs.21.2022.10.28.16.26.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 16:26:03 -0700 (PDT) From: Tanjuate Brunostar To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, outreachy@lists.linux.dev, Tanjuate Brunostar Subject: [PATCH v9 4/6] staging: vt6655: split long lines of code in s_vGenerateTxParamete Date: Fri, 28 Oct 2022 23:23:25 +0000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Increase code visibility by splitting long lines of code in the function: s_vGenerateTxParameter Signed-off-by: Tanjuate Brunostar --- drivers/staging/vt6655/rxtx.c | 68 ++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 21 deletions(-) diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 7b6571ba7c36..475526b73e1a 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -834,7 +834,9 @@ static void s_vFillCTSHead(struct vnt_private *pDevice, } =20 if (byPktType =3D=3D PK_TYPE_11GB || byPktType =3D=3D PK_TYPE_11GA) { - if (byFBOption !=3D AUTO_FB_NONE && uDMAIdx !=3D TYPE_ATIMDMA && uDMAIdx= !=3D TYPE_BEACONDMA) { + if (byFBOption !=3D AUTO_FB_NONE && + uDMAIdx !=3D TYPE_ATIMDMA && + uDMAIdx !=3D TYPE_BEACONDMA) { /* Auto Fall back */ struct vnt_cts_fb *buf =3D pvCTS; /* Get SignalField, ServiceField & Length */ @@ -873,7 +875,11 @@ static void s_vFillCTSHead(struct vnt_private *pDevice, =20 ether_addr_copy(buf->data.ra, pDevice->abyCurrentNetAddr); - } else { /* if (byFBOption !=3D AUTO_FB_NONE && uDMAIdx !=3D TYPE_ATIMDM= A && uDMAIdx !=3D TYPE_BEACONDMA) */ + } else { + /* if (byFBOption !=3D AUTO_FB_NONE && + * uDMAIdx !=3D TYPE_ATIMDMA && + * uDMAIdx !=3D TYPE_BEACONDMA) + */ struct vnt_cts *buf =3D pvCTS; /* Get SignalField, ServiceField & Length */ vnt_get_phy_field(pDevice, uCTSFrameLen, @@ -959,50 +965,70 @@ static void s_vGenerateTxParameter(struct vnt_private= *pDevice, /* Fill RsvTime */ struct vnt_rrv_time_rts *buf =3D pvRrvTime; =20 - buf->rts_rrv_time_aa =3D get_rtscts_time(pDevice, 2, byPktType, cbFrame= Size, wCurrentRate); - buf->rts_rrv_time_ba =3D get_rtscts_time(pDevice, 1, byPktType, cbFrame= Size, wCurrentRate); - buf->rts_rrv_time_bb =3D get_rtscts_time(pDevice, 0, byPktType, cbFrame= Size, wCurrentRate); - buf->rrv_time_a =3D vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSi= ze, wCurrentRate, bNeedACK); - buf->rrv_time_b =3D vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrame= Size, pDevice->byTopCCKBasicRate, bNeedACK); - - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCR= C, psEthHeader, wCurrentRate, byFBOption); + buf->rts_rrv_time_aa =3D get_rtscts_time(pDevice, 2, byPktType, cbFrame= Size, + wCurrentRate); + buf->rts_rrv_time_ba =3D get_rtscts_time(pDevice, 1, byPktType, cbFrame= Size, + wCurrentRate); + buf->rts_rrv_time_bb =3D get_rtscts_time(pDevice, 0, byPktType, cbFrame= Size, + wCurrentRate); + buf->rrv_time_a =3D vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSi= ze, + wCurrentRate, bNeedACK); + buf->rrv_time_b =3D vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrame= Size, + pDevice->byTopCCKBasicRate, + bNeedACK); + + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCR= C, + psEthHeader, wCurrentRate, byFBOption); } else {/* RTS_needless, PCF mode */ struct vnt_rrv_time_cts *buf =3D pvRrvTime; =20 - buf->rrv_time_a =3D vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSi= ze, wCurrentRate, bNeedACK); - buf->rrv_time_b =3D vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrame= Size, pDevice->byTopCCKBasicRate, bNeedACK); - buf->cts_rrv_time_ba =3D get_rtscts_time(pDevice, 3, byPktType, cbFrame= Size, wCurrentRate); + buf->rrv_time_a =3D vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSi= ze, + wCurrentRate, bNeedACK); + buf->rrv_time_b =3D vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrame= Size, + pDevice->byTopCCKBasicRate, + bNeedACK); + buf->cts_rrv_time_ba =3D get_rtscts_time(pDevice, 3, byPktType, cbFrame= Size, + wCurrentRate); =20 /* Fill CTS */ - s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedAC= K, bDisCRC, wCurrentRate, byFBOption); + s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedAC= K, + bDisCRC, wCurrentRate, byFBOption); } } else if (byPktType =3D=3D PK_TYPE_11A) { if (pvRTS) {/* RTS_need, non PCF mode */ struct vnt_rrv_time_ab *buf =3D pvRrvTime; =20 - buf->rts_rrv_time =3D get_rtscts_time(pDevice, 2, byPktType, cbFrameSiz= e, wCurrentRate); - buf->rrv_time =3D vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize= , wCurrentRate, bNeedACK); + buf->rts_rrv_time =3D get_rtscts_time(pDevice, 2, byPktType, cbFrameSiz= e, + wCurrentRate); + buf->rrv_time =3D vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, + wCurrentRate, bNeedACK); =20 /* Fill RTS */ - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCR= C, psEthHeader, wCurrentRate, byFBOption); + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCR= C, + psEthHeader, wCurrentRate, byFBOption); } else if (!pvRTS) {/* RTS_needless, non PCF mode */ struct vnt_rrv_time_ab *buf =3D pvRrvTime; =20 - buf->rrv_time =3D vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSi= ze, wCurrentRate, bNeedACK); + buf->rrv_time =3D vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSi= ze, + wCurrentRate, bNeedACK); } } else if (byPktType =3D=3D PK_TYPE_11B) { if (pvRTS) {/* RTS_need, non PCF mode */ struct vnt_rrv_time_ab *buf =3D pvRrvTime; =20 - buf->rts_rrv_time =3D get_rtscts_time(pDevice, 0, byPktType, cbFrameSiz= e, wCurrentRate); - buf->rrv_time =3D vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSi= ze, wCurrentRate, bNeedACK); + buf->rts_rrv_time =3D get_rtscts_time(pDevice, 0, byPktType, cbFrameSiz= e, + wCurrentRate); + buf->rrv_time =3D vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSi= ze, + wCurrentRate, bNeedACK); =20 /* Fill RTS */ - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCR= C, psEthHeader, wCurrentRate, byFBOption); + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCR= C, + psEthHeader, wCurrentRate, byFBOption); } else { /* RTS_needless, non PCF mode */ struct vnt_rrv_time_ab *buf =3D pvRrvTime; =20 - buf->rrv_time =3D vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSi= ze, wCurrentRate, bNeedACK); + buf->rrv_time =3D vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSi= ze, + wCurrentRate, bNeedACK); } } } --=20 2.34.1