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.9 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 12397C28CBC for ; Sun, 3 May 2020 15:43:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E2D2120836 for ; Sun, 3 May 2020 15:43:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kocurkovo.cz header.i=@kocurkovo.cz header.b="dNl8rEgH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728893AbgECPnS (ORCPT ); Sun, 3 May 2020 11:43:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728881AbgECPnS (ORCPT ); Sun, 3 May 2020 11:43:18 -0400 Received: from mail.kocurkovo.cz (unknown [IPv6:2a02:2b88:2:1::5b29:1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B69DC061A10 for ; Sun, 3 May 2020 08:43:17 -0700 (PDT) Received: by mail.kocurkovo.cz (Postfix, from userid 1000) id ED15C18FF; Sun, 3 May 2020 17:43:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.kocurkovo.cz ED15C18FF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kocurkovo.cz; s=mail; t=1588520594; bh=dsnpnhjrUHSaXiLLDmToUkfJQoMhJ20hDN9zjO5mUkU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dNl8rEgHTdjcTOYqUrmg3v2b5wHHcXb1BdxBabqikOyXK123vafgx2aoXqE6xWS3D lwtXfjrXONakQmZ+13MXj9HCpugFjjBeOsb5E+nwqpQ4RQhbJOdY3rx37EkBfX84H1 5fMCEQbhw6lYLbpVaYJwiCwkxGoS02e251iPGFI4= 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 v2 2/2] staging: vt6655: fix LONG_LINE warning Date: Sun, 3 May 2020 17:42:50 +0200 Message-Id: <1588520570-14388-3-git-send-email-mdujava@kocurkovo.cz> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588520570-14388-1-git-send-email-mdujava@kocurkovo.cz> References: <1588520570-14388-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 using ternary operator. Signed-off-by: Matej Dujava --- drivers/staging/vt6655/rxtx.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index dda578436e64..994c19f1de43 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -170,10 +170,14 @@ s_uGetTxRsvTime( 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 + */ + uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, + byPktType == PK_TYPE_11B ? + pDevice->byTopCCKBasicRate : + pDevice->byTopOFDMBasicRate); return uDataTime + pDevice->uSIFS + uAckTime; } -- 2.26.2