Skip to contentSkip to conversation

staging: r8188eu: os_dep: simplifiy the rtw_resume function

PATCH Superseded Saurav Girepunje 2 participants 3 messages Sep 4, 2021 Staging

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 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.

---
 drivers/staging/r8188eu/os_dep/usb_intf.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/staging/r8188eu/os_dep/usb_intf.c +1 -7
index bb85ab77fd26..673cd3001183 100644
@@ -493,14 +493,8 @@ 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;
+	return rtw_resume_process(padapter);
 }
 
 int rtw_resume_process(struct adapter *padapter)

--
2.32.0

#1 lore raw
Quoted 19 lines · Saurav Girepunje

Remove unused variable ret and pwrpriv.
Remove the condition with no effect (if == else) in usb_intf.c file.

---
 drivers/staging/r8188eu/os_dep/usb_intf.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/staging/r8188eu/os_dep/usb_intf.c +0 -2
index bb85ab77fd26..673cd3001183 100644
@@ -493,14 +493,8 @@ 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;

drivers/staging/r8188eu/os_dep/usb_intf.c static int rtw_resume(struct usb_interface *pusb_intf) · line 500

Quoted 10 lines
drivers/staging/r8188eu/os_dep/usb_intf.c +1 -5
 
-	if (pwrpriv->bInternalAutoSuspend)
-		ret = rtw_resume_process(padapter);
-	else
-		ret = rtw_resume_process(padapter);
-	return ret;
+	return rtw_resume_process(padapter);
 }
 
 int rtw_resume_process(struct adapter *padapter)

Why not just delete the rtw_resume_process() declaration line and make the rtw_resume() function be the whole thing, as rtw_resume_process() is never called anywhere else. That would be even more lines of code removed and simplified here.

thanks,

greg k-h

#2 lore raw
Quoted 36 lines · Greg KH
Quoted 19 lines · Saurav Girepunje

Remove unused variable ret and pwrpriv.
Remove the condition with no effect (if == else) in usb_intf.c file.

---
  drivers/staging/r8188eu/os_dep/usb_intf.c | 8 +-------
  1 file changed, 1 insertion(+), 7 deletions(-)
drivers/staging/r8188eu/os_dep/usb_intf.c +0 -2
index bb85ab77fd26..673cd3001183 100644
@@ -493,14 +493,8 @@ 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;

drivers/staging/r8188eu/os_dep/usb_intf.c static int rtw_resume(struct usb_interface *pusb_intf) · line 500

Quoted 10 lines
drivers/staging/r8188eu/os_dep/usb_intf.c +1 -5
 
-	if (pwrpriv->bInternalAutoSuspend)
-		ret = rtw_resume_process(padapter);
-	else
-		ret = rtw_resume_process(padapter);
-	return ret;
+	return rtw_resume_process(padapter);
  }
 
  int rtw_resume_process(struct adapter *padapter)

Why not just delete the rtw_resume_process() declaration line and make the rtw_resume() function be the whole thing, as rtw_resume_process() is never called anywhere else. That would be even more lines of code removed and simplified here.

Quoted 4 lines

thanks,

greg k-h

Yes, rtw_resume_process function can be removed .
Thanks for review greg.

Regards,
Saurav Girepunje