staging: r8188eu: remove HAL_DEF_CURRENT_ANTENNA

In order to get rid of the function GetHalDefVar8188EUsb(), remove
the HAL_DEF_CURRENT_ANTENNA case from it and move the functionality
into a new function. This is part of the ongoing effort to get rid of
the unwanted hal layer.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220405104910.9769-4-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 2690bce203fd6f121c620c2ff566475a6465254e..c90f36dee1ea0a5ced7c22e28307681855956267 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -464,6 +464,13 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex
 
 }
 
+u8 rtw_current_antenna(struct adapter *adapter)
+{
+       struct hal_data_8188e *haldata = &adapter->haldata;
+
+       return haldata->CurAntenna;
+}
+
 /*
 Caller must hold pmlmepriv->lock first.
 */
@@ -497,7 +504,8 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
                        /* If there are no more slots, expire the oldest */
                        pnetwork = oldest;
 
-                       GetHalDefVar8188EUsb(adapter, HAL_DEF_CURRENT_ANTENNA, &target->PhyInfo.Optimum_antenna);
+                       target->PhyInfo.Optimum_antenna = rtw_current_antenna(adapter);
+
                        memcpy(&pnetwork->network, target,  get_wlan_bssid_ex_sz(target));
                        /*  variable initialize */
                        pnetwork->fixed = false;
@@ -520,7 +528,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
 
                        bssid_ex_sz = get_wlan_bssid_ex_sz(target);
                        target->Length = bssid_ex_sz;
-                       GetHalDefVar8188EUsb(adapter, HAL_DEF_CURRENT_ANTENNA, &target->PhyInfo.Optimum_antenna);
+                       target->PhyInfo.Optimum_antenna = rtw_current_antenna(adapter);
                        memcpy(&pnetwork->network, target, bssid_ex_sz);
 
                        pnetwork->last_scanned = jiffies;

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 2f85d3a545cd14b4df3ffc555be5dae0f6db1ad3..474391bf7cb5355127556e242384abc249b06e04 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -5987,7 +5987,7 @@ u8 collect_bss_info(struct adapter *padapter, struct recv_frame *precv_frame, st
        bssid->Rssi = precv_frame->attrib.phy_info.recvpower; /*  in dBM.raw data */
        bssid->PhyInfo.SignalQuality = precv_frame->attrib.phy_info.SignalQuality;/* in percentage */
        bssid->PhyInfo.SignalStrength = precv_frame->attrib.phy_info.SignalStrength;/* in percentage */
-       GetHalDefVar8188EUsb(padapter, HAL_DEF_CURRENT_ANTENNA,  &bssid->PhyInfo.Optimum_antenna);
+       bssid->PhyInfo.Optimum_antenna = rtw_current_antenna(padapter);
 
        /*  checking SSID */
        p = rtw_get_ie(bssid->IEs + ie_offset, _SSID_IE_, &len, bssid->IELength - ie_offset);

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index ac4c9db03a5040b0b57da8698aa750a0748d966a..77580191d9db9f63e0e875e72f84066f4f2ad14e 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1200,9 +1200,6 @@ void GetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariab
        struct hal_data_8188e *haldata = &Adapter->haldata;
 
        switch (eVariable) {
-       case HAL_DEF_CURRENT_ANTENNA:
-               *((u8 *)pValue) = haldata->CurAntenna;
-               break;
        case HAL_DEF_DBG_DM_FUNC:
                *((u32 *)pValue) = haldata->odmpriv.SupportAbility;
                break;

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 6a80e517a7ad8c8a5279af03f848fb7c76fdbb64..0bc274a695d937b98036d48bf784bf8b18867fc4 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -28,7 +28,6 @@ enum hw_variables {
 };
 
 enum hal_def_variable {
-       HAL_DEF_CURRENT_ANTENNA,
        HAL_DEF_DBG_DM_FUNC,/* for dbg */
 };
 

diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r8188eu/include/rtw_mlme.h
index 37d217aaf5249fc82c5338890137015fcf1aadef..1dc1fbf049afb8fa5f4c72eb20ad4fd20865758e 100644 (file)
--- a/drivers/staging/r8188eu/include/rtw_mlme.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme.h
@@ -598,4 +598,6 @@ void rtw_set_max_rpt_macid(struct adapter *adapter, u8 macid);
 void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *psta,
                              u32 mstatus);
 
+u8 rtw_current_antenna(struct adapter *adapter);
+
 #endif /* __RTL871X_MLME_H_ */