wifi: rtlwifi: Use min()/max() to improve code

Use min()/max() to reduce the code and improve its readability.

Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20250715121721.266713-8-rongqianfeng@vivo.com

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c
index 5ca6b49e73c7270e4f272936b13b85c5b414e59d..4354ae67a379fca246fab956018c1a8702d65500 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c
@@ -1487,22 +1487,9 @@ _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                        rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =
                            rtlefuse->
                            eeprom_chnlarea_txpwr_ht40_1s[rf_path][index];
-
-                       if ((rtlefuse->
-                            eeprom_chnlarea_txpwr_ht40_1s[rf_path][index] -
-                            rtlefuse->
-                            eprom_chnl_txpwr_ht40_2sdf[rf_path][index])
-                           > 0) {
-                               rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =
-                                   rtlefuse->
-                                   eeprom_chnlarea_txpwr_ht40_1s[rf_path]
-                                   [index] -
-                                   rtlefuse->
-                                   eprom_chnl_txpwr_ht40_2sdf[rf_path]
-                                   [index];
-                       } else {
-                               rtlefuse->txpwrlevel_ht40_2s[rf_path][i] = 0;
-                       }
+                       rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =
+                               max(rtlefuse->eeprom_chnlarea_txpwr_ht40_1s[rf_path][index] -
+                                   rtlefuse->eprom_chnl_txpwr_ht40_2sdf[rf_path][index], 0);
                }
 
                for (i = 0; i < 14; i++) {

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c
index ec5d558609fee71508bb25646a75e6fe69555329..989e7cff8e20190833505485149daa9d316c6495 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c
@@ -163,20 +163,9 @@ _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                        rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =
                            rtlefuse->
                            eeprom_chnlarea_txpwr_ht40_1s[rf_path][index];
-                       if ((rtlefuse->
-                            eeprom_chnlarea_txpwr_ht40_1s[rf_path][index] -
-                            rtlefuse->
-                            eprom_chnl_txpwr_ht40_2sdf[rf_path][index])
-                           > 0) {
-                               rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =
-                                   rtlefuse->
-                                   eeprom_chnlarea_txpwr_ht40_1s[rf_path]
-                                   [index] - rtlefuse->
-                                   eprom_chnl_txpwr_ht40_2sdf[rf_path]
-                                   [index];
-                       } else {
-                               rtlefuse->txpwrlevel_ht40_2s[rf_path][i] = 0;
-                       }
+                       rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =
+                               max(rtlefuse->eeprom_chnlarea_txpwr_ht40_1s[rf_path][index] -
+                                   rtlefuse->eprom_chnl_txpwr_ht40_2sdf[rf_path][index], 0);
                }
                for (i = 0; i < 14; i++) {
                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c
index 17486e3f322c7733fc3fe80ae2934639140ce18b..0108850bb9e5a800a3cbd13bd91f0811f0670e65 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c
@@ -223,10 +223,7 @@ static void rtl92ee_dm_dig(struct ieee80211_hw *hw)
 
        if (mac->link_state >= MAC80211_LINKED) {
                if (bfirstconnect) {
-                       if (dm_dig->rssi_val_min <= dig_maxofmin)
-                               current_igi = dm_dig->rssi_val_min;
-                       else
-                               current_igi = dig_maxofmin;
+                       current_igi = min(dm_dig->rssi_val_min, dig_maxofmin);
 
                        dm_dig->large_fa_hit = 0;
                } else {

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
index 21b827f519b648a7e0263ebfce2487b65280cb0e..bd45d9bd40bb745bc171a54cd65f02595d03c16a 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
@@ -1449,18 +1449,9 @@ _rtl8723e_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                                rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
                                        [rf_path][index];
 
-                       if ((rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
-                                       [rf_path][index] -
-                            rtlefuse->eprom_chnl_txpwr_ht40_2sdf
-                                       [rf_path][index]) > 0) {
-                               rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =
-                                 rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
-                                 [rf_path][index] -
-                                 rtlefuse->eprom_chnl_txpwr_ht40_2sdf
-                                 [rf_path][index];
-                       } else {
-                               rtlefuse->txpwrlevel_ht40_2s[rf_path][i] = 0;
-                       }
+                       rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =
+                               max(rtlefuse->eeprom_chnlarea_txpwr_ht40_1s[rf_path][index] -
+                                   rtlefuse->eprom_chnl_txpwr_ht40_2sdf[rf_path][index], 0);
                }
 
                for (i = 0; i < 14; i++) {

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c
index c53f95144812fc5f40c84562aebf919003f61450..c65d14fb914f6d097e9ecdfef3758573eff1acf8 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c
@@ -468,10 +468,7 @@ static void rtl8723be_dm_dig(struct ieee80211_hw *hw)
 
        if (mac->link_state >= MAC80211_LINKED) {
                if (bfirstconnect) {
-                       if (dm_digtable->rssi_val_min <= dig_maxofmin)
-                               current_igi = dm_digtable->rssi_val_min;
-                       else
-                               current_igi = dig_maxofmin;
+                       current_igi = min(dm_digtable->rssi_val_min, dig_maxofmin);
 
                        dm_digtable->large_fa_hit = 0;
                } else {

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
index 76b5395539d0eb9b20a6056359f7d1734697f8cc..f8b159c74658f418918d36abe7b93cf93906f6b4 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
@@ -756,10 +756,7 @@ static void rtl8821ae_dm_dig(struct ieee80211_hw *hw)
                rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
                        "DIG AfterLink\n");
                if (first_connect) {
-                       if (dm_digtable->rssi_val_min <= dig_max_of_min)
-                               current_igi = dm_digtable->rssi_val_min;
-                       else
-                               current_igi = dig_max_of_min;
+                       current_igi = min(dm_digtable->rssi_val_min, dig_max_of_min);
                        rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
                                "First Connect\n");
                } else {