staging: rtl8723bs: remove pointless if else in rtw_sdio_resume()

Whether any of the conditions is true or not, the return variable
is always set to rtw_resume_process(padapter). Replace the if else
construct with a single call to rtw_resume_process(). Also remove
the now unused local variable pwrpriv.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index 22191c9584ad2ba588b2c3171f5d0ed253e146cc..6d02904de63f393d7eca2c6031ea24051993c880 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -605,7 +605,6 @@ static int rtw_sdio_resume(struct device *dev)
 {
        struct sdio_func *func =dev_to_sdio_func(dev);
        struct dvobj_priv *psdpriv = sdio_get_drvdata(func);
-       struct pwrctrl_priv *pwrpriv = dvobj_to_pwrctl(psdpriv);
        struct adapter *padapter = psdpriv->if1;
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
        int ret = 0;
@@ -615,25 +614,11 @@ static int rtw_sdio_resume(struct device *dev)
 
        pdbgpriv->dbg_resume_cnt++;
 
-       if (pwrpriv->bInternalAutoSuspend)
-       {
-               ret = rtw_resume_process(padapter);
-       }
-       else
-       {
-               if (pwrpriv->wowlan_mode || pwrpriv->wowlan_ap_mode)
-               {
-                       ret = rtw_resume_process(padapter);
-               }
-               else
-               {
-                       ret = rtw_resume_process(padapter);
-               }
-       }
+       ret = rtw_resume_process(padapter);
+
        pmlmeext->last_scan_time = jiffies;
        DBG_871X("<========  %s return %d\n", __func__, ret);
        return ret;
-
 }
 
 static int __init rtw_drv_entry(void)