From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752898AbdJaEsN (ORCPT ); Tue, 31 Oct 2017 00:48:13 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:51084 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751119AbdJaEsL (ORCPT ); Tue, 31 Oct 2017 00:48:11 -0400 X-Google-Smtp-Source: ABhQp+SFnREG/R0sR5NAtz0L/5u9JzVHar+haeN82QoT598QMMNXmhWaWIXEktfZL463y6jx6OU6SQ== Message-ID: <1509425284.1199.11.camel@gmail.com> Subject: [PATCH v2] staging: rtlwifi: Fix line too long warning From: Kien Ha To: Dan Carpenter Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org Date: Tue, 31 Oct 2017 00:48:04 -0400 In-Reply-To: <20171030120214.knmechriwu62yh2t@mwanda> References: <1509297176.4894.4.camel@gmail.com> <20171030120214.knmechriwu62yh2t@mwanda> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.26.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >>From aa0f4ae8c325545b1fd794d6bbf8c4d2f64e2ec2 Mon Sep 17 00:00:00 2001 From: Kien Ha Date: Fri, 27 Oct 2017 14:07:55 -0400 Subject: [PATCH v2] staging: rtlwifi: Fix line too long warning Made nested if else statement more concise to help conform to coding style. Signed-off-by: Kien Ha --- Changes in v2: - Improve block of code to be more concise drivers/staging/rtlwifi/base.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/staging/rtlwifi/base.c b/drivers/staging/rtlwifi/base.c index b88b0e8edd3d..fdd1ab1e38c5 100644 --- a/drivers/staging/rtlwifi/base.c +++ b/drivers/staging/rtlwifi/base.c @@ -1273,23 +1273,14 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw, * and N rate will all be controlled by FW * when tcb_desc->use_driver_rate = false */ - if (sta && sta->vht_cap.vht_supported) { - tcb_desc->hw_rate = - _rtl_get_vht_highest_n_rate(hw, sta); - } else { - if (sta && (sta->ht_cap.ht_supported)) { - tcb_desc->hw_rate = - _rtl_get_highest_n_rate(hw, sta); - } else { - if (rtlmac->mode == WIRELESS_MODE_B) { - tcb_desc->hw_rate = - rtlpriv->cfg->maps[RTL_RC_CCK_RATE11M]; - } else { - tcb_desc->hw_rate = - rtlpriv->cfg->maps[RTL_RC_OFDM_RATE54M]; - } - } - } + tcb_desc->hw_rate = + sta && sta->vht_cap.vht_supported ? + rtl_get_vht_highest_n_rate(hw, sta) : + sta && sta->ht_cap.ht_supported ? + _rtl_get_highest_n_rate(hw, sta) : + rtlmac->mode == WIRELESS_MODE_B ? + rtlpriv->cfg->maps[RTL_RC_CCK_RATE11M] : + rtlpriv->cfg->maps[RTL_RC_OFDM_RATE54M]; } if (is_multicast_ether_addr(hdr->addr1)) -- 2.14.3