openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: rtlwifi: Remove unnecessary conditions 

Remove conditions with no effect. Issues found by Coccinelle's semantic
patch results for cond_no_effect.cocci. Eliminate checkpatch result, a
line should not end with a parenthesis.

Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Maya Nakamura 2018-10-31 14:09:15 -07:00 committed by Greg Kroah-Hartman
parent 95a32556da
commit ec5043bf85
4 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/staging/rtlwifi/phydm/phydm_debug.c
View File

@ -140,26 +140,17 @@ 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);
}
}

9
drivers/staging/rtlwifi/phydm/phydm_dig.c
View File

@ -599,13 +599,8 @@ void odm_dig_init(void *dm_void)
(DM_DIG_MAX_PAUSE_TYPE + 1));
dig_tab->pause_cckpd_level = 0;
if (dm->board_type & (ODM_BOARD_EXT_PA | ODM_BOARD_EXT_LNA)) {
dig_tab->rx_gain_range_max = DM_DIG_MAX_NIC;
dig_tab->rx_gain_range_min = DM_DIG_MIN_NIC;
} else {
dig_tab->rx_gain_range_max = DM_DIG_MAX_NIC;
dig_tab->rx_gain_range_min = DM_DIG_MIN_NIC;
}
dig_tab->rx_gain_range_max = DM_DIG_MAX_NIC;
dig_tab->rx_gain_range_min = DM_DIG_MIN_NIC;
dig_tab->enable_adjust_big_jump = 1;
if (dm->support_ic_type & ODM_RTL8822B) {

2
drivers/staging/rtlwifi/phydm/phydm_hwconfig.c
View File

@ -1719,8 +1719,6 @@ static void phydm_get_rx_phy_status_type2(struct phy_dm_struct *dm,
ODM_RTL8710B)) { /* JJ ADD 20161014 */
if (rxsc == 3)
bw = ODM_BW40M;
else if ((rxsc == 1) || (rxsc == 2))
bw = ODM_BW20M;
else
bw = ODM_BW20M;
}

7
drivers/staging/rtlwifi/phydm/phydm_psd.c
View File

@ -336,12 +336,7 @@ void phydm_psd_init(void *dm_void)
2; /*2b'11: 20MHz, 2b'10: 40MHz, 2b'01: 80MHz */
}
if (dm->support_ic_type == ODM_RTL8812)
dm_psd_table->psd_pwr_common_offset = 0;
else if (dm->support_ic_type == ODM_RTL8821)
dm_psd_table->psd_pwr_common_offset = 0;
else
dm_psd_table->psd_pwr_common_offset = 0;
dm_psd_table->psd_pwr_common_offset = 0;
phydm_psd_para_setting(dm, 1, 2, 3, 128, 0, 0, 7, 0);
/*phydm_psd(dm, 0x3c, 0, 127);*/ /* target at -50dBm */