staging: rtl8723bs: Change the return type

Remove the ret variable in rtw_suspend_common() and change
the return type from int to void as rtw_suspend_common()
always return zero unconditionally.

Signed-off-by: Saurav Girepunje <saurav.girepunje@gmail.com>
Link: https://lore.kernel.org/r/20210428175520.GA8921@user
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/include/osdep_intf.h b/drivers/staging/rtl8723bs/include/osdep_intf.h
index 48c90f00cc2ebb1d38b305d41d171e023baba8f6..111e0179712ac6e0b8846c65e30f5dd3716618d0 100644 (file)
--- a/drivers/staging/rtl8723bs/include/osdep_intf.h
+++ b/drivers/staging/rtl8723bs/include/osdep_intf.h
@@ -66,7 +66,7 @@ void rtw_ips_pwr_down(struct adapter *padapter);
 int rtw_drv_register_netdev(struct adapter *padapter);
 void rtw_ndev_destructor(struct net_device *ndev);
 
-int rtw_suspend_common(struct adapter *padapter);
+void rtw_suspend_common(struct adapter *padapter);
 int rtw_resume_common(struct adapter *padapter);
 
 int netdev_open(struct net_device *pnetdev);

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 6ac78a9ae615c466d1033db77bb8f318c93392de..1988f666228d7cb5be23e6e7b0ab74eb27281ea2 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -1150,14 +1150,13 @@ static void rtw_suspend_normal(struct adapter *padapter)
                padapter->intf_deinit(adapter_to_dvobj(padapter));
 }
 
-int rtw_suspend_common(struct adapter *padapter)
+void rtw_suspend_common(struct adapter *padapter)
 {
        struct dvobj_priv *psdpriv = padapter->dvobj;
        struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;
        struct pwrctrl_priv *pwrpriv = dvobj_to_pwrctl(psdpriv);
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
-       int ret = 0;
        unsigned long start_time = jiffies;
 
        netdev_dbg(padapter->pnetdev, " suspend start\n");
@@ -1200,7 +1199,7 @@ int rtw_suspend_common(struct adapter *padapter)
 
 exit:
 
-       return ret;
+       return;
 }
 
 static int rtw_resume_process_normal(struct adapter *padapter)

diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index 5e484344e1727db683864a62a17ff493d5ef940d..490431484524296946f97c1a3a1aaf8059db0c82 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -447,7 +447,9 @@ static int rtw_sdio_suspend(struct device *dev)
                return 0;
        }
 
-       return rtw_suspend_common(padapter);
+       rtw_suspend_common(padapter);
+
+       return 0;
 }
 
 static int rtw_resume_process(struct adapter *padapter)