From patchwork Tue Nov 24 16:37:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milan Lakhani X-Patchwork-Id: 11929381 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EBC0C2D0E4 for ; Tue, 24 Nov 2020 16:37:18 +0000 (UTC) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AA3A520715 for ; Tue, 24 Nov 2020 16:37:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=lists.elisa.tech header.i=@lists.elisa.tech header.b="Hi/Px/0+" Authentication-Results: mail.kernel.org; dmarc=permerror header.from=codethink.co.uk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+72012+203+5278000+9232812@lists.elisa.tech X-Received: by 127.0.0.2 with SMTP id DmaLYY5279335xtRNDnb9USp; Tue, 24 Nov 2020 08:37:17 -0800 X-Received: from ubuntu.localdomain (ubuntu.localdomain [2.127.6.98]) by mx.groups.io with SMTP id smtpd.web12.54523.1606235836402974736 for ; Tue, 24 Nov 2020 08:37:16 -0800 X-Received: by ubuntu.localdomain (Postfix, from userid 0) id 6BF551612EC; Tue, 24 Nov 2020 16:37:14 +0000 (GMT) From: "Milan Lakhani" To: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-safety@lists.elisa.tech Cc: Milan Lakhani Subject: [linux-safety] [PATCH v2 2/2] staging: vt6655: Use macro in rxtx.c Date: Tue, 24 Nov 2020 16:37:13 +0000 Message-Id: <1606235833-6077-2-git-send-email-milan.lakhani@codethink.co.uk> In-Reply-To: <1606235833-6077-1-git-send-email-milan.lakhani@codethink.co.uk> References: <1606235833-6077-1-git-send-email-milan.lakhani@codethink.co.uk> Precedence: Bulk List-Unsubscribe: Sender: linux-safety@lists.elisa.tech List-Id: Mailing-List: list linux-safety@lists.elisa.tech; contact linux-safety+owner@lists.elisa.tech List-Post: X-Gm-Message-State: hUIjgi6WKpWgCpvxK2FEWl40x5278000AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.elisa.tech; q=dns/txt; s=20140610; t=1606235837; bh=jHcnEv9iIYowF2i9gcOAhz6TatRGXhujZsJu2MgilTY=; h=Cc:Date:From:Subject:To; b=Hi/Px/0+ABXfVkqxPLqbsSoPAtt9D9n0UO/pOIBdDT7SDJ9kbopATmauQDpiqi8ey5J mAUcPx6e2MAgrVDQoY9CVus8uvWA2T9szk2bPezgeXbpu/wgO53wIMnuGnfcBiXfmoeF1 qWjm/aBZfBiM+4ll1sm1Dl1PAQdxlGSlKYU= Use macro for repeated function to get the data duration and timestamp, correcting line length and alignment warnings in rxtx.c. Reported by checkpatch. Signed-off-by: Milan Lakhani --- drivers/staging/vt6655/rxtx.c | 51 ++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index ff45206..5ce0362 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -423,6 +423,10 @@ s_uGetRTSCTSDuration( return cpu_to_le16((u16)uDurTime); } +#define getDurationTimeStamp(byDurType, byPktType, wRate) \ + (cpu_to_le16((u16)s_uGetDataDuration(pDevice, (byDurType), cbFrameLength, (byPktType), \ + (wRate), bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption))) + static __le16 s_uFillDataHead( @@ -467,15 +471,10 @@ s_uFillDataHead( } else { /* Get Duration and TimeStamp */ buf->duration_a = - cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, - byPktType, wCurrentRate, bNeedAck, uFragIdx, - cbLastFragmentSize, uMACfragNum, - byFBOption)); + getDurationTimeStamp(DATADUR_A, byPktType, wCurrentRate); buf->duration_b = - cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, - PK_TYPE_11B, pDevice->byTopCCKBasicRate, - bNeedAck, uFragIdx, cbLastFragmentSize, - uMACfragNum, byFBOption)); + getDurationTimeStamp(DATADUR_B, PK_TYPE_11B, + pDevice->byTopCCKBasicRate); } buf->time_stamp_off_a = vnt_time_stamp_off(pDevice, wCurrentRate); @@ -492,14 +491,11 @@ s_uFillDataHead( pDevice->byTopCCKBasicRate, PK_TYPE_11B, &buf->b); /* Get Duration and TimeStamp */ - buf->duration_a = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, - wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); - buf->duration_b = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, PK_TYPE_11B, - pDevice->byTopCCKBasicRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); - buf->duration_a_f0 = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A_F0, cbFrameLength, byPktType, - wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); - buf->duration_a_f1 = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A_F1, cbFrameLength, byPktType, - wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); + buf->duration_a = getDurationTimeStamp(DATADUR_A, byPktType, wCurrentRate); + buf->duration_b = getDurationTimeStamp(DATADUR_B, PK_TYPE_11B, + pDevice->byTopCCKBasicRate); + buf->duration_a_f0 = getDurationTimeStamp(DATADUR_A_F0, byPktType, wCurrentRate); + buf->duration_a_f1 = getDurationTimeStamp(DATADUR_A_F1, byPktType, wCurrentRate); buf->time_stamp_off_a = vnt_time_stamp_off(pDevice, wCurrentRate); buf->time_stamp_off_b = vnt_time_stamp_off(pDevice, pDevice->byTopCCKBasicRate); @@ -517,12 +513,11 @@ s_uFillDataHead( byPktType, &buf->a); /* Get Duration and TimeStampOff */ - buf->duration = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, - wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); - buf->duration_f0 = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A_F0, cbFrameLength, byPktType, - wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); - buf->duration_f1 = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A_F1, cbFrameLength, byPktType, - wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); + buf->duration = getDurationTimeStamp(DATADUR_A, byPktType, wCurrentRate); + buf->duration_f0 = getDurationTimeStamp(DATADUR_A_F0, byPktType, + wCurrentRate); + buf->duration_f1 = getDurationTimeStamp(DATADUR_A_F1, byPktType, + wCurrentRate); buf->time_stamp_off = vnt_time_stamp_off(pDevice, wCurrentRate); return buf->duration; } @@ -537,11 +532,7 @@ s_uFillDataHead( buf->duration = dur; } else { /* Get Duration and TimeStampOff */ - buf->duration = - cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, - wCurrentRate, bNeedAck, uFragIdx, - cbLastFragmentSize, uMACfragNum, - byFBOption)); + buf->duration = getDurationTimeStamp(DATADUR_A, byPktType, wCurrentRate); } buf->time_stamp_off = vnt_time_stamp_off(pDevice, wCurrentRate); @@ -558,11 +549,7 @@ s_uFillDataHead( buf->duration = dur; } else { /* Get Duration and TimeStampOff */ - buf->duration = - cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, byPktType, - wCurrentRate, bNeedAck, uFragIdx, - cbLastFragmentSize, uMACfragNum, - byFBOption)); + buf->duration = getDurationTimeStamp(DATADUR_B, byPktType, wCurrentRate); } buf->time_stamp_off = vnt_time_stamp_off(pDevice, wCurrentRate);