[PATCH 1/2] staging: fix possible_condition_with_no_effect warnings

[Umang Parmar]

Remove unnecessary conditions where if and else block had same code.
Signed-off-by: Umang Parmar 
---
 .../rtlwifi/btcoexist/halbtc8822b2ant.c   |  6 
 .../staging/rtlwifi/btcoexist/halbtcoutsrc.c  |  6 ++--
 drivers/staging/rtlwifi/phydm/phydm_debug.c   | 29 ++-
 drivers/staging/rtlwifi/phydm/phydm_dig.c | 10 ++-
 .../staging/rtlwifi/phydm/phydm_hwconfig.c|  4 +--
 drivers/staging/rtlwifi/phydm/phydm_psd.c |  7 +
 6 files changed, 16 insertions(+), 46 deletions(-)

diff --git a/drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.c 
b/drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.c
index 7e6071059a95..cfa194c77d5a 100644
--- a/drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.c
+++ b/drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.c
@@ -2696,12 +2696,6 @@ static void halbtc8822b2ant_action_hid(struct 
btc_coexist *btcoexist)
 NORMAL_EXEC, 4);
halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,
108);
-   } else if (wifi_bw == 0) { /* if 11bg mode */
-
-   halbtc8822b2ant_coex_table_with_type(btcoexist,
-NORMAL_EXEC, 8);
-   halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,
-   111);
} else {
halbtc8822b2ant_coex_table_with_type(btcoexist,
 NORMAL_EXEC, 8);
diff --git a/drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c 
b/drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c
index 4d1f9bf53c53..d01f83c21cce 100644
--- a/drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c
+++ b/drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c
@@ -484,10 +484,8 @@ static s32 halbtc_get_wifi_rssi(struct rtl_priv *rtlpriv)
 {
int undec_sm_pwdb = 0;
 
-   if (rtlpriv->mac80211.link_state >= MAC80211_LINKED)
-   undec_sm_pwdb = rtlpriv->dm.undec_sm_pwdb;
-   else /* associated entry pwdb */
-   undec_sm_pwdb = rtlpriv->dm.undec_sm_pwdb;
+   undec_sm_pwdb = rtlpriv->dm.undec_sm_pwdb;
+
return undec_sm_pwdb;
 }
 
diff --git a/drivers/staging/rtlwifi/phydm/phydm_debug.c 
b/drivers/staging/rtlwifi/phydm/phydm_debug.c
index b5b69d5f1a41..47ad19f35479 100644
--- a/drivers/staging/rtlwifi/phydm/phydm_debug.c
+++ b/drivers/staging/rtlwifi/phydm/phydm_debug.c
@@ -140,26 +140,15 @@ static inline void phydm_print_csi(struct phy_dm_struct 
*dm, u32 used,
dword_h = odm_get_bb_reg(dm, 0xF74, MASKDWORD);
dword_l = odm_get_bb_reg(dm, 0xF5C, MASKDWORD);
 
-   if (index % 2 == 0)
-   PHYDM_SNPRINTF(
-   output + used, out_len - used,
-   "%02x  %02x  %02x  %02x  %02x  %02x  %02x  
%02x\n",
-   dword_l & MASKBYTE0, (dword_l & MASKBYTE1) >> 8,
-   (dword_l & MASKBYTE2) >> 16,
-   (dword_l & MASKBYTE3) >> 24,
-   dword_h & MASKBYTE0, (dword_h & MASKBYTE1) >> 8,
-   (dword_h & MASKBYTE2) >> 16,
-   (dword_h & MASKBYTE3) >> 24);
-   else
-   PHYDM_SNPRINTF(
-   output + used, out_len - used,
-   "%02x  %02x  %02x  %02x  %02x  %02x  %02x  
%02x\n",
-   dword_l & MASKBYTE0, (dword_l & MASKBYTE1) >> 8,
-   (dword_l & MASKBYTE2) >> 16,
-   (dword_l & MASKBYTE3) >> 24,
-   dword_h & MASKBYTE0, (dword_h & MASKBYTE1) >> 8,
-   (dword_h & MASKBYTE2) >> 16,
-   (dword_h & MASKBYTE3) >> 24);
+   PHYDM_SNPRINTF(
+   output + used, out_len - used,
+   "%02x  %02x  %02x  %02x  %02x  %02x  %02x  %02x\n",
+   dword_l & MASKBYTE0, (dword_l & MASKBYTE1) >> 8,
+   (dword_l & MASKBYTE2) >> 16,
+   (dword_l & MASKBYTE3) >> 24,
+   dword_h & MASKBYTE0, (dword_h & MASKBYTE1) >> 8,
+   (dword_h & MASKBYTE2) >> 16,
+   (dword_h & MASKBYTE3) >> 24);
}
 }
 
diff --git a/drivers/staging/rtlwifi/phydm/phydm_dig.c 
b/drivers/staging/rtlwifi/phydm/phydm_dig.c
index 3115e7bdc749..9c3574232f03 100644
--- a/drivers/staging/rtlwifi/phydm/phydm_

[PATCH 2/2] staging: fix unneeded_variables warnings

[Umang Parmar]

Directly return value and remove unneeded variables.
Signed-off-by: Umang Parmar 
---
 .../staging/rtlwifi/phydm/phydm_hwconfig.c| 23 +--
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/drivers/staging/rtlwifi/phydm/phydm_hwconfig.c 
b/drivers/staging/rtlwifi/phydm/phydm_hwconfig.c
index bf0af36ceb9e..81957f1a4c65 100644
--- a/drivers/staging/rtlwifi/phydm/phydm_hwconfig.c
+++ b/drivers/staging/rtlwifi/phydm/phydm_hwconfig.c
@@ -493,8 +493,7 @@ static u8 odm_sq_process_patch_rt_cid_819x_lenovo(struct 
phy_dm_struct *dm,
  u8 is_cck_rate, u8 pwdb_all,
  u8 path, u8 RSSI)
 {
-   u8 sq = 0;
-   return sq;
+   return 0;
 }
 
 static u8 odm_evm_db_to_percentage(s8 value)
@@ -1881,35 +1880,25 @@ void phydm_rx_phy_status_new_type(struct phy_dm_struct 
*phydm, u8 *phy_status,
 
 u32 query_phydm_trx_capability(struct phy_dm_struct *dm)
 {
-   u32 value32 = 0x;
-
-   return value32;
+   return 0x;
 }
 
 u32 query_phydm_stbc_capability(struct phy_dm_struct *dm)
 {
-   u32 value32 = 0x;
-
-   return value32;
+   return 0x;
 }
 
 u32 query_phydm_ldpc_capability(struct phy_dm_struct *dm)
 {
-   u32 value32 = 0x;
-
-   return value32;
+   return 0x;
 }
 
 u32 query_phydm_txbf_parameters(struct phy_dm_struct *dm)
 {
-   u32 value32 = 0x;
-
-   return value32;
+   return 0x;
 }
 
 u32 query_phydm_txbf_capability(struct phy_dm_struct *dm)
 {
-   u32 value32 = 0x;
-
-   return value32;
+   return 0x;
 }
-- 
2.18.0

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel