mirror of
https://github.com/armbian/build.git
synced 2025-08-12 22:26:57 +02:00
9b611efc21
* Add megous files for 5.16, tag orange-pi-5.16-20220216-2000 * Optimize the selection of a set of patches * Remove unused patches * Fix the state on the version tag=v5.16.11 Signed-off-by: The-going <48602507+The-going@users.noreply.github.com> Co-authored-by: Igor Pecovnik <igor.pecovnik@gmail.com>
80 lines
3.2 KiB
Diff
80 lines
3.2 KiB
Diff
From 9217ae2fab83a4e4ba136ac502b4859bcff8bbdf Mon Sep 17 00:00:00 2001
|
|
From: Ye Guojin <ye.guojin@zte.com.cn>
|
|
Date: Thu, 4 Nov 2021 06:11:19 +0000
|
|
Subject: [PATCH 495/562] rtw89: remove unnecessary conditional operators
|
|
|
|
The conditional operator is unnecessary while assigning values to the
|
|
bool variables.
|
|
|
|
Reported-by: Zeal Robot <zealci@zte.com.cn>
|
|
Signed-off-by: Ye Guojin <ye.guojin@zte.com.cn>
|
|
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
Link: https://lore.kernel.org/r/20211104061119.1685-1-ye.guojin@zte.com.cn
|
|
---
|
|
drivers/net/wireless/realtek/rtw89/debug.c | 2 +-
|
|
drivers/net/wireless/realtek/rtw89/mac.c | 2 +-
|
|
drivers/net/wireless/realtek/rtw89/phy.c | 2 +-
|
|
drivers/net/wireless/realtek/rtw89/rtw8852a.c | 4 ++--
|
|
4 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/debug.c b/drivers/net/wireless/realtek/rtw89/debug.c
|
|
index 29eb188c888c..75f10627585b 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/debug.c
|
|
+++ b/drivers/net/wireless/realtek/rtw89/debug.c
|
|
@@ -814,7 +814,7 @@ rtw89_debug_priv_mac_dbg_port_dump_select(struct file *filp,
|
|
return -EINVAL;
|
|
}
|
|
|
|
- enable = set == 0 ? false : true;
|
|
+ enable = set != 0;
|
|
switch (sel) {
|
|
case 0:
|
|
debugfs_priv->dbgpkg_en.ss_dbg = enable;
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c
|
|
index afcd07ab1de7..944c23293cb9 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/mac.c
|
|
+++ b/drivers/net/wireless/realtek/rtw89/mac.c
|
|
@@ -3695,7 +3695,7 @@ void _rtw89_mac_bf_monitor_track(struct rtw89_dev *rtwdev)
|
|
{
|
|
struct rtw89_traffic_stats *stats = &rtwdev->stats;
|
|
struct rtw89_vif *rtwvif;
|
|
- bool en = stats->tx_tfc_lv > stats->rx_tfc_lv ? false : true;
|
|
+ bool en = stats->tx_tfc_lv <= stats->rx_tfc_lv;
|
|
bool old = test_bit(RTW89_FLAG_BFEE_EN, rtwdev->flags);
|
|
|
|
if (en == old)
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/phy.c b/drivers/net/wireless/realtek/rtw89/phy.c
|
|
index 0620ef02e275..abb4cdcd03e7 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/phy.c
|
|
+++ b/drivers/net/wireless/realtek/rtw89/phy.c
|
|
@@ -1779,7 +1779,7 @@ static void rtw89_phy_cfo_dm(struct rtw89_dev *rtwdev)
|
|
}
|
|
rtw89_phy_cfo_crystal_cap_adjust(rtwdev, new_cfo);
|
|
cfo->cfo_avg_pre = new_cfo;
|
|
- x_cap_update = cfo->crystal_cap == pre_x_cap ? false : true;
|
|
+ x_cap_update = cfo->crystal_cap != pre_x_cap;
|
|
rtw89_debug(rtwdev, RTW89_DBG_CFO, "Xcap_up=%d\n", x_cap_update);
|
|
rtw89_debug(rtwdev, RTW89_DBG_CFO, "Xcap: D:%x C:%x->%x, ofst=%d\n",
|
|
cfo->def_x_cap, pre_x_cap, cfo->crystal_cap,
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
|
|
index 5c6ffca3a324..9e25e53f6c4a 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
|
|
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
|
|
@@ -1053,10 +1053,10 @@ static void rtw8852a_set_channel_bb(struct rtw89_dev *rtwdev,
|
|
struct rtw89_channel_params *param,
|
|
enum rtw89_phy_idx phy_idx)
|
|
{
|
|
- bool cck_en = param->center_chan > 14 ? false : true;
|
|
+ bool cck_en = param->center_chan <= 14;
|
|
u8 pri_ch_idx = param->pri_ch_idx;
|
|
|
|
- if (param->center_chan <= 14)
|
|
+ if (cck_en)
|
|
rtw8852a_ctrl_sco_cck(rtwdev, param->center_chan,
|
|
param->primary_chan, param->bandwidth);
|
|
|
|
--
|
|
2.34.1
|
|
|