staging: rtl8723au: Remove two layers of wrappers around rtw_cfg80211_indicate_scan_d...

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index f72bae42dcb007a95b5e81a7ea035246133de61a..8d45c1c841ef75a9d286327a6345b5d54eea0f09 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -959,11 +959,6 @@ void rtw_indicate_disconnect23a(struct rtw_adapter *padapter)
 
 }
 
-inline void rtw_indicate_scan_done23a(struct rtw_adapter *padapter, bool aborted)
-{
-       rtw_os_indicate_scan_done23a(padapter, aborted);
-}
-
 void rtw_scan_abort23a(struct rtw_adapter *adapter)
 {
        unsigned long start;
@@ -985,7 +980,8 @@ void rtw_scan_abort23a(struct rtw_adapter *adapter)
        if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) {
                if (!adapter->bDriverStopped && !adapter->bSurpriseRemoved)
                        DBG_8723A(FUNC_NDEV_FMT"waiting for scan_abort time out!\n", FUNC_NDEV_ARG(adapter->pnetdev));
-               rtw_indicate_scan_done23a(adapter, true);
+               rtw_cfg80211_indicate_scan_done(wdev_to_priv(adapter->rtw_wdev),
+                                               true);
        }
        pmlmeext->scan_abort = false;
 }
@@ -1546,7 +1542,7 @@ void rtw_scan_timeout_handler23a(unsigned long data)
 
        spin_unlock_bh(&pmlmepriv->lock);
 
-       rtw_indicate_scan_done23a(adapter, true);
+       rtw_cfg80211_indicate_scan_done(wdev_to_priv(adapter->rtw_wdev), true);
 }
 
 static void rtw_auto_scan_handler(struct rtw_adapter *padapter)

diff --git a/drivers/staging/rtl8723au/include/mlme_osdep.h b/drivers/staging/rtl8723au/include/mlme_osdep.h
index b7132a9a13783f039a3460d236e23cb9e772718b..82584dad18646a828c1aecbc3cd663d5cb835b32 100644 (file)
--- a/drivers/staging/rtl8723au/include/mlme_osdep.h
+++ b/drivers/staging/rtl8723au/include/mlme_osdep.h
@@ -20,7 +20,6 @@
 
 void rtw_os_indicate_disconnect23a(struct rtw_adapter *adapter);
 void rtw_os_indicate_connect23a(struct rtw_adapter *adapter);
-void rtw_os_indicate_scan_done23a(struct rtw_adapter *padapter, bool aborted);
 void rtw_report_sec_ie23a(struct rtw_adapter *adapter, u8 authmode, u8 *sec_ie);
 
 void rtw_reset_securitypriv23a(struct rtw_adapter *adapter);

diff --git a/drivers/staging/rtl8723au/include/rtw_mlme.h b/drivers/staging/rtl8723au/include/rtw_mlme.h
index dac930c77c0107a34b3cc0ca10fc5f7277a35f77..2d4f61b919430665668b9a7a8e0bd9122dd60c30 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_mlme.h
+++ b/drivers/staging/rtl8723au/include/rtw_mlme.h
@@ -553,7 +553,6 @@ void rtw_free_assoc_resources23a(struct rtw_adapter *adapter,
                              int lock_scanned_queue);
 void rtw_indicate_disconnect23a(struct rtw_adapter *adapter);
 void rtw_indicate_connect23a(struct rtw_adapter *adapter);
-void rtw_indicate_scan_done23a(struct rtw_adapter *padapter, bool aborted);
 void rtw_scan_abort23a(struct rtw_adapter *adapter);
 
 int rtw_restruct_sec_ie23a(struct rtw_adapter *adapter, u8 *in_ie, u8 *out_ie,

diff --git a/drivers/staging/rtl8723au/os_dep/mlme_linux.c b/drivers/staging/rtl8723au/os_dep/mlme_linux.c
index b30d4d37556ab8d601e59c546856f4c869205ced..37ecdb4eba2dd571ddf9b2a3fcb7e555856602c3 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8723au/os_dep/mlme_linux.c
@@ -30,12 +30,6 @@ void rtw_os_indicate_connect23a(struct rtw_adapter *adapter)
                rtw_signal_process(adapter->pid[2], SIGALRM);
 }
 
-void rtw_os_indicate_scan_done23a(struct rtw_adapter *padapter, bool aborted)
-{
-       rtw_cfg80211_indicate_scan_done(wdev_to_priv(padapter->rtw_wdev),
-                                       aborted);
-}
-
 static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE];
 
 void rtw_reset_securitypriv23a(struct rtw_adapter *adapter)

diff --git a/drivers/staging/rtl8723au/os_dep/usb_intf.c b/drivers/staging/rtl8723au/os_dep/usb_intf.c
index 612806e0de2e80f5a2d01044f9bbdd3717d97eda..778508d3a047426a8d73a0fad03f0540350d4314 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8723au/os_dep/usb_intf.c
@@ -509,7 +509,8 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
        up(&pwrpriv->lock);
 
        if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))
-               rtw_indicate_scan_done23a(padapter, 1);
+               rtw_cfg80211_indicate_scan_done(
+                       wdev_to_priv(padapter->rtw_wdev), true);
 
        if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING))
                rtw_indicate_disconnect23a(padapter);