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>

diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
index df055b8652e0cd5138b4b66e60364f1bc2459b3c..7bd5c61b055c9e2528e99f6ad04629777abbe8cb 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -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);

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 82ae573925fc052c25ebf4a79eed1e5bc219f64e..542a5fe33f1dc089d5e3460e62091c1ba71e1091 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -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 */

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 1f09e668c672de58e860244c3dd75df4fcb65da4..69b479ea58721a1ec4c3f1c5f8723b70b85cea56 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -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);

diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
index 2763479f7601957d534279500b600fd0bdfd92dc..638b12ae6ee975abf6da727e28bce2635cd18a3a 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_com.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com.c
@@ -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)
 {
 

diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/rtl8723bs/include/hal_com.h
index d1c5b31930437fa65580b2e6a262dca335d20220..f5c3ce5da70c1e1ee5fbb5a2eadad86dd47c0a68 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_com.h
+++ b/drivers/staging/rtl8723bs/include/hal_com.h
@@ -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);