Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp2765841ybz; Sun, 3 May 2020 08:48:16 -0700 (PDT) X-Google-Smtp-Source: APiQypI+oI4R/I68uO84RCJBOJK6IDTOQ3/lcDBG7aqZrxghnGVLVhIeB0Cf76qSywVn6duMU9EB X-Received: by 2002:a17:906:496:: with SMTP id f22mr11293453eja.311.1588520896079; Sun, 03 May 2020 08:48:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588520896; cv=none; d=google.com; s=arc-20160816; b=orp7RYRIbqLr1p7TEv5lluEFAB/dEMIP3LDCvMmb4Nk1v1ytngbPyLzI4hQX/H/ETV YR5SvvACHcLG94sVg3hD8+VF4eJ6+tZTqS6RGMiphBj992Pmc4xcOyomfXYf3oWZBtVf tXjqhdV56ftFjr96pcdapUJooML8x3D7kOLHUXgfH+cEn9dr0clhd9/8qBrkgIb003zk Wno5ZRHEDYMymW5Dsj9JN7iN5FWPnQe/Ugo+vy73m4D1BnThTRM5kBxlENf4eRi0MpLc lAJ9+OVJWU3q/kNnraKV3/13o8F7uZdfVLExAZs/32WFwGU0hoN/jxCIv1tbtSU8kBW9 JZ9A== 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=dsnpnhjrUHSaXiLLDmToUkfJQoMhJ20hDN9zjO5mUkU=; b=FgvtJ5LVuxB9uEAdtilNfnb5TEtKOrD4pLSkgAE1STrVtRYCaz+O9CKrddvtSDBVwa qqyE1pLrbgLH61bUHxQg6N+Q5FHYF5Z4BQBJuYMHlzjsoFHn4enFQEnGBSwql9YRUE00 x9VoWdq4M8aCRVPW5KSf6Ohl8YRofsATWDRl0tEskdMdBgayBOjuD1s60KCNF2EU+YgQ 5WVOLp6D1vpIySB9dtQRr0NNuUQKZRkSfEE6McTYqQgYcIOcOlu3HpMCDHTlQ4KsPGTD q1YkY/4xnMRKB4D/mD1l9zSNUNQs5iCNgmEs54L66G5LCWqLaqCBK01txWq3GAC8wCcZ X1Tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kocurkovo.cz header.s=mail header.b=dNl8rEgH; 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 q4si5468659eji.14.2020.05.03.08.47.53; Sun, 03 May 2020 08:48:16 -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=dNl8rEgH; 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 S1728888AbgECPnS (ORCPT + 99 others); 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