From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 5885AC47257 for ; Sat, 2 May 2020 22:16:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 285E8208DB for ; Sat, 2 May 2020 22:16:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kocurkovo.cz header.i=@kocurkovo.cz header.b="YvbktAIT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728571AbgEBWQu (ORCPT ); Sat, 2 May 2020 18:16:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728530AbgEBWQt (ORCPT ); Sat, 2 May 2020 18:16:49 -0400 Received: from mail.kocurkovo.cz (unknown [IPv6:2a02:2b88:2:1::5b29:1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BFA9C061A0C for ; Sat, 2 May 2020 15:16:49 -0700 (PDT) Received: by mail.kocurkovo.cz (Postfix, from userid 1000) id 660E218CB; Sun, 3 May 2020 00:16:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.kocurkovo.cz 660E218CB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kocurkovo.cz; s=mail; t=1588457807; bh=2+ok7hSFqmJ9p6NZRS3iB+ks9qy0qquKr2HJfKft10E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YvbktAIT615fXGeU1BszZYJYUx4uMSlrhuWIN4yTspPjZTsvW+S3VFfV85HYU1uCU 7XLB3Z46YKQLOvZjPdpjk3cUwUnXJdj6B+Z723//7idA3sx8rmqSnM35pXgoB+w7wK 1n+5FzRYzOarZYQFYdWcWiTM/Foe+vmQwwER6vhc= 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 2/2] staging: vt6655: fix LONG_LINE warning Date: Sun, 3 May 2020 00:16:34 +0200 Message-Id: <1588457794-31438-2-git-send-email-mdujava@kocurkovo.cz> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588457794-31438-1-git-send-email-mdujava@kocurkovo.cz> References: <1588457794-31438-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 fix LONG_LINE error from checkpatch, by createing temporary variable so call to the function is not in if/else block. Signed-off-by: Matej Dujava --- drivers/staging/vt6655/rxtx.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index dda578436e64..782177dfd67e 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -164,16 +164,24 @@ s_uGetTxRsvTime( ) { unsigned int uDataTime, uAckTime; + unsigned short basic_rate; uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, cbFrameLength, wRate); if (!bNeedAck) return uDataTime; - if (byPktType == PK_TYPE_11B) /* llb,CCK mode */ - uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopCCKBasicRate); - else /* 11g 2.4G OFDM mode & 11a 5G OFDM mode */ - uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopOFDMBasicRate); + /* + * CCK mode - 11b + * OFDM mode - 11g 2.4G & 11a 5G + */ + if (byPktType == PK_TYPE_11B) + basic_rate = (unsigned short)pDevice->byTopCCKBasicRate; + else + basic_rate = (unsigned short)pDevice->byTopOFDMBasicRate; + + uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, + basic_rate); return uDataTime + pDevice->uSIFS + uAckTime; } -- 2.26.2 From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 0CCC5C3A5A9 for ; Sat, 2 May 2020 22:16:57 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D052D2072E for ; Sat, 2 May 2020 22:16:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kocurkovo.cz header.i=@kocurkovo.cz header.b="YvbktAIT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D052D2072E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kocurkovo.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=driverdev-devel-bounces@linuxdriverproject.org Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 952E38833D; Sat, 2 May 2020 22:16:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bZOBmlvRurNs; Sat, 2 May 2020 22:16:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 19F9288329; Sat, 2 May 2020 22:16:55 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id B61F71BF326 for ; Sat, 2 May 2020 22:16:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6B57D204D6 for ; Sat, 2 May 2020 22:16:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IR3x+wUdMMPZ for ; Sat, 2 May 2020 22:16:50 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.kocurkovo.cz (mail.kocurkovo.cz [185.8.236.170]) by silver.osuosl.org (Postfix) with ESMTPS id 2DF6E20496 for ; Sat, 2 May 2020 22:16:49 +0000 (UTC) Received: by mail.kocurkovo.cz (Postfix, from userid 1000) id 660E218CB; Sun, 3 May 2020 00:16:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.kocurkovo.cz 660E218CB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kocurkovo.cz; s=mail; t=1588457807; bh=2+ok7hSFqmJ9p6NZRS3iB+ks9qy0qquKr2HJfKft10E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YvbktAIT615fXGeU1BszZYJYUx4uMSlrhuWIN4yTspPjZTsvW+S3VFfV85HYU1uCU 7XLB3Z46YKQLOvZjPdpjk3cUwUnXJdj6B+Z723//7idA3sx8rmqSnM35pXgoB+w7wK 1n+5FzRYzOarZYQFYdWcWiTM/Foe+vmQwwER6vhc= From: Matej Dujava To: Forest Bond , Greg Kroah-Hartman , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] staging: vt6655: fix LONG_LINE warning Date: Sun, 3 May 2020 00:16:34 +0200 Message-Id: <1588457794-31438-2-git-send-email-mdujava@kocurkovo.cz> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588457794-31438-1-git-send-email-mdujava@kocurkovo.cz> References: <1588457794-31438-1-git-send-email-mdujava@kocurkovo.cz> X-BeenThere: driverdev-devel@linuxdriverproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Frank A. Cancio Bello" , Stefano Brivio , Briana Oursler MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" This patch will fix LONG_LINE error from checkpatch, by createing temporary variable so call to the function is not in if/else block. Signed-off-by: Matej Dujava --- drivers/staging/vt6655/rxtx.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index dda578436e64..782177dfd67e 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -164,16 +164,24 @@ s_uGetTxRsvTime( ) { unsigned int uDataTime, uAckTime; + unsigned short basic_rate; uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, cbFrameLength, wRate); if (!bNeedAck) return uDataTime; - if (byPktType == PK_TYPE_11B) /* llb,CCK mode */ - uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopCCKBasicRate); - else /* 11g 2.4G OFDM mode & 11a 5G OFDM mode */ - uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopOFDMBasicRate); + /* + * CCK mode - 11b + * OFDM mode - 11g 2.4G & 11a 5G + */ + if (byPktType == PK_TYPE_11B) + basic_rate = (unsigned short)pDevice->byTopCCKBasicRate; + else + basic_rate = (unsigned short)pDevice->byTopOFDMBasicRate; + + uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, + basic_rate); return uDataTime + pDevice->uSIFS + uAckTime; } -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel