UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: rtl8723bs: Remove rtw_hal_networktype_to_raid() 

Change call sites of rtw_hal_networktype_to_raid to instead call
networktype_to_raid_ex as rtw_hal_networktype_to_raid does nothing
except call networktype_to_raid_ex.
Remove now-unused function rtw_hal_networktype_to_raid.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nishka Dasgupta 2019-06-28 16:28:34 +05:30 committed by Greg Kroah-Hartman
parent 2e82900fdd
commit 777a43348a
5 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/rtl8723bs/core/rtw_ap.c
View File

@ -443,7 +443,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
}
psta->wireless_mode = sta_band;
psta->raid = rtw_hal_networktype_to_raid(padapter, psta);
psta->raid = networktype_to_raid_ex(padapter, psta);
if (psta->aid < NUM_STA) {
u8 arg[4] = {0};
@ -512,7 +512,7 @@ void update_bmc_sta(struct adapter *padapter)
rtw_hal_update_sta_rate_mask(padapter, psta);
tx_ra_bitmap = psta->ra_mask;
psta->raid = rtw_hal_networktype_to_raid(padapter, psta);
psta->raid = networktype_to_raid_ex(padapter, psta);
/* ap mode */
rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true);

2
drivers/staging/rtl8723bs/core/rtw_mlme.c
View File

@ -1186,7 +1186,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
rtw_hal_update_sta_rate_mask(padapter, psta);
psta->wireless_mode = pmlmeext->cur_wireless_mode;
psta->raid = rtw_hal_networktype_to_raid(padapter, psta);
psta->raid = networktype_to_raid_ex(padapter, psta);
/* sta mode */

2
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
View File

@ -5563,7 +5563,7 @@ void mlmeext_sta_add_event_callback(struct adapter *padapter, struct sta_info *p
/* ToDo: HT for Ad-hoc */
psta->wireless_mode = rtw_check_network_type(psta->bssrateset, psta->bssratelen, pmlmeext->cur_channel);
psta->raid = rtw_hal_networktype_to_raid(padapter, psta);
psta->raid = networktype_to_raid_ex(padapter, psta);
/* rate radaptive */
Update_RA_Entry(padapter, psta);

6
drivers/staging/rtl8723bs/hal/hal_com.c
View File

@ -963,12 +963,6 @@ exit:
return ret;
}
u8 rtw_hal_networktype_to_raid(struct adapter *adapter, struct sta_info *psta)
{
return networktype_to_raid_ex(adapter, psta);
}
u8 rtw_get_mgntframe_raid(struct adapter *adapter, unsigned char network_type)
{

1
drivers/staging/rtl8723bs/include/hal_com.h
View File

@ -232,7 +232,6 @@ void rtw_init_hal_com_default_value(struct adapter * Adapter);
void c2h_evt_clear(struct adapter *adapter);
s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf);
u8 rtw_hal_networktype_to_raid(struct adapter *adapter, struct sta_info *psta);
u8 rtw_get_mgntframe_raid(struct adapter *adapter, unsigned char network_type);
void rtw_hal_update_sta_rate_mask(struct adapter *padapter, struct sta_info *psta);