From: Jes Sorensen Date: Mon, 21 Jul 2014 09:25:08 +0000 (+0200) Subject: staging: rtl8723au: Fold rtw_resume_process23a() into rtw_resume() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=30c588e04c2ba3d2cc1ff06c2d0bc7ef9d3d9cf0;p=linux-beck.git staging: rtl8723au: Fold rtw_resume_process23a() into rtw_resume() Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h index 396decb44edc..404acb52352d 100644 --- 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 aeaedcdbb422..c75427f510c8 100644 --- 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;