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 <saurav.girepunje@gmail.com>
Link: https://lore.kernel.org/r/YTshmPcZr/aVclHK@user
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/include/usb_osintf.h b/drivers/staging/r8188eu/include/usb_osintf.h
index d1a1f73..34229b1 100644 (file)
--- a/drivers/staging/r8188eu/include/usb_osintf.h
+++ b/drivers/staging/r8188eu/include/usb_osintf.h
@@ -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

diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index b174cc6..78c857d 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
@@ -451,18 +451,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;
@@ -470,12 +458,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);