From nobody Tue Apr 7 00:29:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74BEBC433FE for ; Sun, 9 Oct 2022 04:03:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229839AbiJIEDm (ORCPT ); Sun, 9 Oct 2022 00:03:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229755AbiJIEDg (ORCPT ); Sun, 9 Oct 2022 00:03:36 -0400 X-Greylist: delayed 444 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sat, 08 Oct 2022 21:03:34 PDT Received: from mail-200162.simplelogin.co (mail-200162.simplelogin.co [176.119.200.162]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B74A62C132 for ; Sat, 8 Oct 2022 21:03:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lirui.org; s=dkim; t=1665287768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=iPV8Gr0A3WvVBv+aKdKuNYK/1CkjazGd25vK8oTb8P4=; b=R0Ham59Nrb2/MrbdyRVkhsqnuMiL9Gat7fcNN+VHwiN2yzKIOY9cKPokOY7ohob3inc34k 9+NfocY5UyM8PL0Fr6pceNa80BxWOv2yGGY2/o1RER3ykcbJd9VbxSfZnMpI0gxAJeFKOg oS3e7y3gV3xecXFjrcakHxxa22R2/Mk= Subject: [PATCH] staging: rtl8192e: Fix braces/tabs/number/OOM warnings Date: Sun, 9 Oct 2022 11:55:36 +0800 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Rui Li To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Message-ID: <166528776854.9.8249842126243786800.67724771@lirui.org> X-SimpleLogin-Type: Reply X-SimpleLogin-EmailLog-ID: 67724773 X-SimpleLogin-Want-Signing: yes Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Fix warnings generated by checkpatch.pl: unnecessary braces after if, too many leading tabs, int type conversion before number, OOM message ourput. Signed-off-by: Rui Li --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 3 +- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 9 ++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 -- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 30 +++++++------------ drivers/staging/rtl8192e/rtl819x_BAProc.c | 5 ++-- drivers/staging/rtl8192e/rtl819x_HTProc.c | 1 + drivers/staging/rtl8192e/rtllib_rx.c | 8 ++--- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 7 ++--- 8 files changed, 25 insertions(+), 41 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 18e4e5d84878..8d20b0deca37 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1112,9 +1112,8 @@ void rtl92e_fill_tx_desc(struct net_device *dev, str= uct tx_desc *pdesc, if (cb_desc->bHwSec) { static u8 tmp; =20 - if (!tmp) { + if (!tmp) tmp =3D 1; - } switch (priv->rtllib->pairwise_key_type) { case KEY_TYPE_WEP40: case KEY_TYPE_WEP104: diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 1b592258e640..4e3d183be0f2 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -522,9 +522,8 @@ static bool _rtl92e_bb_config_para_file(struct net_devi= ce *dev) rtStatus =3D rtl92e_check_bb_and_rf(dev, (enum hw90_block)eCheckItem, (enum rf90_radio_path)0); - if (!rtStatus) { + if (!rtStatus) return rtStatus; - } } rtl92e_set_bb_reg(dev, rFPGA0_RFMOD, bCCKEn|bOFDMEn, 0x0); _rtl92e_phy_config_bb(dev, BaseBand_Config_PHY_REG); @@ -1379,9 +1378,8 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, i++; } =20 - if (i >=3D MAX_DOZE_WAITING_TIMES_9x) { + if (i >=3D MAX_DOZE_WAITING_TIMES_9x) break; - } } rtl92e_set_rf_off(dev); break; @@ -1398,9 +1396,8 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, i++; } =20 - if (i >=3D MAX_DOZE_WAITING_TIMES_9x) { + if (i >=3D MAX_DOZE_WAITING_TIMES_9x) break; - } } =20 if (pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_HALT_NIC && diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 89bc989cffba..b2facb273474 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -908,9 +908,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->card_type =3D PCI; =20 priv->pFirmware =3D vzalloc(sizeof(struct rt_firmware)); - if (!priv->pFirmware) - netdev_err(dev, - "rtl8192e: Unable to allocate space for firmware\n"); =20 skb_queue_head_init(&priv->skb_queue); =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 702551056227..32494ad2298b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -267,9 +267,8 @@ static void _rtl92e_dm_check_ac_dc_power(struct net_dev= ice *dev) "PATH=3D/usr/bin:/bin", NULL}; =20 - if (priv->ResetProgress =3D=3D RESET_TYPE_SILENT) { + if (priv->ResetProgress =3D=3D RESET_TYPE_SILENT) return; - } =20 if (priv->rtllib->state !=3D RTLLIB_LINKED) return; @@ -330,9 +329,8 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_d= evice *dev) bool bshort_gi_enabled =3D false; static u8 ping_rssi_state; =20 - if (!priv->up) { + if (!priv->up) return; - } =20 if (pra->rate_adaptive_disabled) return; @@ -777,9 +775,8 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(str= uct net_device *dev) tmpRegA =3D rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance, bMaskDWord); for (i =3D 0; i < OFDM_Table_Length; i++) { - if (tmpRegA =3D=3D OFDMSwingTable[i]) { + if (tmpRegA =3D=3D OFDMSwingTable[i]) priv->OFDM_index[0] =3D i; - } } =20 TempCCk =3D rtl92e_get_bb_reg(dev, rCCK0_TxFilter1, bMaskByte2); @@ -1066,9 +1063,8 @@ void rtl92e_dm_restore_state(struct net_device *dev) u32 reg_ratr =3D priv->rate_adaptive.last_ratr; u32 ratr_value; =20 - if (!priv->up) { + if (!priv->up) return; - } =20 if (priv->rate_adaptive.rate_adaptive_disabled) return; @@ -1877,20 +1873,16 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct ne= t_device *dev) tmp_cck_sec_pwdb =3D cur_cck_pwdb; cck_rx_ver2_sec_index =3D i; } else if (cur_cck_pwdb =3D=3D - tmp_cck_sec_pwdb) { - if (tmp_cck_sec_pwdb =3D=3D - tmp_cck_min_pwdb) { - tmp_cck_sec_pwdb =3D - cur_cck_pwdb; - cck_rx_ver2_sec_index =3D - i; - } + tmp_cck_sec_pwdb && + tmp_cck_sec_pwdb =3D=3D tmp_cck_min_pwdb) { + tmp_cck_sec_pwdb =3D cur_cck_pwdb; + cck_rx_ver2_sec_index =3D i; } else if ((cur_cck_pwdb < tmp_cck_sec_pwdb) && (cur_cck_pwdb > tmp_cck_min_pwdb)) { ; - } else if (cur_cck_pwdb =3D=3D tmp_cck_min_pwdb) { - if (tmp_cck_sec_pwdb =3D=3D tmp_cck_min_pwdb) - tmp_cck_min_pwdb =3D cur_cck_pwdb; + } else if (cur_cck_pwdb =3D=3D tmp_cck_min_pwdb && + tmp_cck_sec_pwdb =3D=3D tmp_cck_min_pwdb) { + tmp_cck_min_pwdb =3D cur_cck_pwdb; } else if (cur_cck_pwdb < tmp_cck_min_pwdb) { tmp_cck_min_pwdb =3D cur_cck_pwdb; } diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rt= l8192e/rtl819x_BAProc.c index 19d13b3fcecf..e932ad1a9e96 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -180,11 +180,10 @@ static void rtllib_send_ADDBAReq(struct rtllib_device= *ieee, u8 *dst, =20 skb =3D rtllib_ADDBA(ieee, dst, pBA, 0, ACT_ADDBAREQ); =20 - if (skb) { + if (skb) softmac_mgmt_xmit(skb, ieee); - } else { + else netdev_dbg(ieee->dev, "Failed to generate ADDBAReq packet.\n"); - } } =20 static void rtllib_send_ADDBARsp(struct rtllib_device *ieee, u8 *dst, diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index ef3dca51cf99..b763cf0ba356 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -70,6 +70,7 @@ static u8 LINKSYS_MARVELL_4400N[3] =3D {0x00, 0x14, 0xa4}; void HTUpdateDefaultSetting(struct rtllib_device *ieee) { struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + pHTInfo->bRegShortGI20MHz =3D 1; pHTInfo->bRegShortGI40MHz =3D 1; =20 diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index 46d75e925ee9..ca7eba826ece 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -454,14 +454,14 @@ static bool AddReorderEntry(struct rx_ts_record *pTS, while (pList->next !=3D &pTS->rx_pending_pkt_list) { if (SN_LESS(pReorderEntry->SeqNum, ((struct rx_reorder_entry *) list_entry(pList->next, struct rx_reorder_entry, - List))->SeqNum)) + List))->SeqNum)) { pList =3D pList->next; - else if (SN_EQUAL(pReorderEntry->SeqNum, + continue; + } else if (SN_EQUAL(pReorderEntry->SeqNum, ((struct rx_reorder_entry *)list_entry(pList->next, struct rx_reorder_entry, List))->SeqNum)) return false; - else - break; + break; } pReorderEntry->List.next =3D pList->next; pReorderEntry->List.next->prev =3D &pReorderEntry->List; diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index f9589c5b62ba..4fc4fb25d8d6 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -41,8 +41,8 @@ int rtllib_wx_set_freq(struct rtllib_device *ieee, struct= iw_request_info *a, =20 /* if setting by freq convert to channel */ if (fwrq->e =3D=3D 1) { - if ((fwrq->m >=3D (int)2.412e8 && - fwrq->m <=3D (int)2.487e8)) { + if ((fwrq->m >=3D 2.412e8 && + fwrq->m <=3D 2.487e8)) { int f =3D fwrq->m / 100000; int c =3D 0; =20 @@ -571,9 +571,8 @@ int rtllib_wx_set_power(struct rtllib_device *ieee, ieee->ps =3D RTLLIB_PS_DISABLED; goto exit; } - if (wrqu->power.flags & IW_POWER_TIMEOUT) { + if (wrqu->power.flags & IW_POWER_TIMEOUT) ieee->ps_timeout =3D wrqu->power.value / 1000; - } =20 if (wrqu->power.flags & IW_POWER_PERIOD) ieee->ps_period =3D wrqu->power.value / 1000; --=20 2.30.2