staging: r8188eu: os_dep: simplifiy the rtw_resume function
PATCH v3 1/1 staging: r8188eu: os_dep: simplifiy the rtw_resume function
Remove unused variable ret and pwrpriv.
Remove the condition with no effect (if == else) in usb_intf.c file.
Remove rtw_resume_process() and move whole thing to rtw_resume(). Remove the padapter NULL check which couldn't NULL in rtw_resume function.
Signed-off-by Saurav Girepunje <[email protected]>
---
ChangeLog V3:
- Remove the padapter NULL check.
ChangeLog V2:
- Remove rtw_resume_process() and move whole thing to rtw_resume().
drivers/staging/r8188eu/include/usb_osintf.h | 2 -- drivers/staging/r8188eu/os_dep/usb_intf.c | 20 ++------------------ 2 files changed, 2 insertions(+), 20 deletions(-)
drivers/staging/r8188eu/include/usb_osintf.h +0 -2
@@ -24,6 +24,4 @@ void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr,void nat25_db_expire (struct adapter *priv);int nat25_db_handle (struct adapter *priv,struct sk_buff *skb,int method); -int rtw_resume_process (struct adapter *padapter); -#endif
drivers/staging/r8188eu/os_dep/usb_intf.c +2 -18
@@ -493,18 +493,6 @@ static int rtw_resume(struct usb_interface *pusb_intf) {struct dvobj_priv *dvobj =usb_get_intfdata (pusb_intf);struct adapter *padapter = dvobj->if1; -struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -int ret =0 ; - -if (pwrpriv->bInternalAutoSuspend) - ret =rtw_resume_process (padapter); -else - ret =rtw_resume_process (padapter); -return ret; -} - -int rtw_resume_process (struct adapter *padapter) -{struct net_device *pnetdev;struct pwrctrl_priv *pwrpriv =NULL ;int ret =-1 ;
@@ -512,12 +500,8 @@ int rtw_resume_process(struct adapter *padapter)DBG_88E ("==> %s (%s:%d)\n" , __func__, current->comm, current->pid); -if (padapter) { - pnetdev = padapter->pnetdev; - pwrpriv = &padapter->pwrctrlpriv; - }else { - goto exit; - } + pnetdev = padapter->pnetdev; + pwrpriv = &padapter->pwrctrlpriv;_enter_pwrlock (&pwrpriv->lock);rtw_reset_drv_sw (padapter);
--
2.32.0