staging: rtl8723au: Fold rtw_resume_process23a() into rtw_resume()

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

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index 396decb44edc58e4c664bc1138093cf8df04163a..404acb52352daa0ef57eb23c19c47975845ad214 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -101,7 +101,6 @@ enum hardware_type {
 
 void rtw_hal_def_value_init23a(struct rtw_adapter *padapter);
 int pm_netdev_open23a(struct net_device *pnetdev, u8 bnormal);
-int rtw_resume_process23a(struct rtw_adapter *padapter);
 
 int rtl8723au_hal_init(struct rtw_adapter *padapter);
 int rtl8723au_hal_deinit(struct rtw_adapter *padapter);

diff --git a/drivers/staging/rtl8723au/os_dep/usb_intf.c b/drivers/staging/rtl8723au/os_dep/usb_intf.c
index aeaedcdbb422301f2523eb75e97d6f47b8dcac97..c75427f510c8c035d1b8321ec8dff54489a4ee41 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8723au/os_dep/usb_intf.c
@@ -488,15 +488,6 @@ static int rtw_resume(struct usb_interface *pusb_intf)
 {
        struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
        struct rtw_adapter *padapter = dvobj->if1;
-       int ret;
-
-       ret = rtw_resume_process23a(padapter);
-
-       return ret;
-}
-
-int rtw_resume_process23a(struct rtw_adapter *padapter)
-{
        struct net_device *pnetdev;
        struct pwrctrl_priv *pwrpriv = NULL;
        int ret = -1;