Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp2666748ybz; Sun, 3 May 2020 06:31:42 -0700 (PDT) X-Google-Smtp-Source: APiQypLCEXlUJAIn1XsboCuQKtWjG7oTaRzku8j/L4Zy5UuAb/p+BLFIqj4jUabTzh+/QRLB0YdH X-Received: by 2002:a05:6402:1297:: with SMTP id w23mr10598054edv.151.1588512702143; Sun, 03 May 2020 06:31:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588512702; cv=none; d=google.com; s=arc-20160816; b=FMQT+9sG95nnZP5x/54wPAuWyxn71WDRoTdWR5FyVIWnvPXMHaT4SN6L0Bft0HFO1P ji8f80P5Pin6IlQKhq+NxUTPVvxAaCOMFbJ8olJ924sif+8qbTPMe6jFCUPizQgwnFaq YEcdH0Tp6SVsmkiUvcNI2KpfMI1tLEyoG6k9U2GeDp5LxQOz9gQuZjUBJ8fsF+ZDTtCR jCes8pAmLs9y9PNnG+7vciKQBk9wuZU5JsT/VN4Y1isfiMp3pVLxyh1XmAG0KUENo6Hp PzhM675OcW9D/6b5teFmnv3KrhZhXfFIGr8pJLQ9a48wxI6VcOV/U8YLH6d5ptf7jIvx UzeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=E/M1+fpZ9BWdUh/UPu/JUV9VouoTHOw3qfqD6bm6qFc=; b=NV9E43dI0l/hnBbRNoCK83ztO5MdUiupvBITyGQoz3JZoORnPp2flkDIEskvtd8yxt Z/8Lu7mxWR3K08x2HnJtTTOwBgHTM2rev8tGYDrWynxOxjZI2N219/1uyMzRmxekUgUs OAViyaIiT7qHJcsOB/Dg6YOuT5VL/24Y4/qmsDykD06KIAGMC0BgrMMYcaWJtzPqeTF3 m51rfA6LLljbOSoyH4EF8B8T3+RQMiB7qfhxmMU3FdigUNCipvDAj0Pc6bMvxiG73O7T /a2TB58lG/OzSD4FcwJ75OLtg8iUyTrZ5Z8W5MzpNcWhal1hh2KUDoUaiPZ0ZLOhPrGf /96A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kocurkovo.cz header.s=mail header.b=NSkfRasV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id nm1si5130072ejb.451.2020.05.03.06.31.19; Sun, 03 May 2020 06:31:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kocurkovo.cz header.s=mail header.b=NSkfRasV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728677AbgECN3g (ORCPT + 99 others); Sun, 3 May 2020 09:29:36 -0400 Received: from mail.kocurkovo.cz ([185.8.236.170]:59400 "EHLO mail.kocurkovo.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728668AbgECN3f (ORCPT ); Sun, 3 May 2020 09:29:35 -0400 Received: by mail.kocurkovo.cz (Postfix, from userid 1000) id 77F6D18CB; Sun, 3 May 2020 15:29:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.kocurkovo.cz 77F6D18CB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kocurkovo.cz; s=mail; t=1588512573; bh=E/M1+fpZ9BWdUh/UPu/JUV9VouoTHOw3qfqD6bm6qFc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NSkfRasV8wbXhtoGVac4YMgEwq4Y5n4+UvpJ8aO0K2ZmqK29Y0YeD5hiChJ3+f1cE Ipuii6E9gE83MW289WXXXzR4ociHbBamYmX6pCVh7o+41KjNrgBV62XP+mYz1uLqTO wXZ+dMqxBvfCLysmFMJhnl6fjkaDPcddhSv7ClbU= From: Matej Dujava To: Forest Bond , Greg Kroah-Hartman , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Cc: Stefano Brivio , Briana Oursler , "Frank A. Cancio Bello" , Matej Dujava Subject: [PATCH 5/5] staging: vt6655: extract index manupulation out of function call Date: Sun, 3 May 2020 15:29:12 +0200 Message-Id: <1588512552-12297-6-git-send-email-mdujava@kocurkovo.cz> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588512552-12297-1-git-send-email-mdujava@kocurkovo.cz> References: <1588512552-12297-1-git-send-email-mdujava@kocurkovo.cz> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch will remove if/else by selecting proper argument before function call, also index is updated before function call. Signed-off-by: Matej Dujava --- drivers/staging/vt6655/rxtx.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index c4d62c27f1c1..1e025bb72810 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -266,7 +266,8 @@ s_uGetDataDuration( return 0; } else { /* First Frag or Mid Frag */ - uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, wRate, bNeedAck); + uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, + len, wRate, bNeedAck); } return pDevice->uSIFS + uAckTime + uNextPktTime; @@ -283,8 +284,8 @@ s_uGetDataDuration( return 0; } else { /* First Frag or Mid Frag */ - uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, - wRate, bNeedAck); + uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, + len, wRate, bNeedAck); } return pDevice->uSIFS + uAckTime + uNextPktTime; @@ -307,17 +308,15 @@ s_uGetDataDuration( else if (wRate > RATE_54M) wRate = RATE_54M; - if (byFBOption == AUTO_FB_0) { - uNextPktTime = s_uGetTxRsvTime(pDevice, - byPktType, len, - wFB_Opt0[FB_RATE0][wRate - RATE_18M], - bNeedAck); - } else { - uNextPktTime = s_uGetTxRsvTime(pDevice, - byPktType, len, - wFB_Opt1[FB_RATE0][wRate - RATE_18M], - bNeedAck); - } + wRate -= RATE_18M; + + if (byFBOption == AUTO_FB_0) + wRate = wFB_Opt0[FB_RATE0][wRate]; + else + wRate = wFB_Opt1[FB_RATE0][wRate]; + + uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, + len, wRate, bNeedAck); } return pDevice->uSIFS + uAckTime + uNextPktTime; -- 2.26.2