diff options
author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-07-21 09:25:08 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 19:09:28 (GMT) |
commit | 30c588e04c2ba3d2cc1ff06c2d0bc7ef9d3d9cf0 (patch) | |
tree | 660df68c87b781296f6711c4100d1498518d9d02 /drivers | |
parent | dc20d1da78a631b1c823b6cebbf8f659d0faac1d (diff) | |
download | linux-30c588e04c2ba3d2cc1ff06c2d0bc7ef9d3d9cf0.tar.xz |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/rtl8723au/include/hal_intf.h | 1 | ||||
-rw-r--r-- | drivers/staging/rtl8723au/os_dep/usb_intf.c | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h index 396decb..404acb5 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 aeaedcd..c75427f 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; |