From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5966FC433B4 for ; Thu, 29 Apr 2021 22:27:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2C5B6610FA for ; Thu, 29 Apr 2021 22:27:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229686AbhD2W2Z (ORCPT ); Thu, 29 Apr 2021 18:28:25 -0400 Received: from mail-40136.protonmail.ch ([185.70.40.136]:15516 "EHLO mail-40136.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229519AbhD2W2Y (ORCPT ); Thu, 29 Apr 2021 18:28:24 -0400 Date: Thu, 29 Apr 2021 22:27:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bryanbrattlof.com; s=protonmail3; t=1619735255; bh=4Xd3/yJD4QqhdhJkdT5Ia1FGfkBKb1yCAXSC+nOxr7k=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=b889kpQsLHe+ddqjLbaknQqMdg+a6fyCMljqMR8P6euZfE7JwK4r+CP6BB7SjSeUL ftq90v6y6sI8tM4gBhq0aBEnVb7s52Xbed1aJvSctFmFXYL0ISB0YGSDn9RwoyZrtH t6LApGzVHESeJnhdzro0cXvWij+HP1P21LOtGn3R85gMsp2GMP9CRcMt2chJrVUtP4 DkGIMT4try6EEiE+QdXeEgqQt6+wI0gsFBqjccB7AwuN8ASWtZqI/23fVnj6zUzSz/ AhybAl9JLnH4olrn9LEiwu1BmRO8tvY38aEq2bWXlDidluyv4tOj+MzQfvU6WL4WkR NHo5VF7ouJ1WA== To: Saurav Girepunje From: Bryan Brattlof Cc: gregkh@linuxfoundation.org, marcocesati@gmail.com, fabioaiuto83@gmail.com, dan.carpenter@oracle.com, john.oldman@polehill.co.uk, ross.schm.dev@gmail.com, insafonov@gmail.com, hdegoede@redhat.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, saurav.girepunje@hotmail.com Reply-To: Bryan Brattlof Subject: Re: [PATCH] staging: rtl8723bs: Change the return type Message-ID: <20210429222721.rudewp22t55fkmgf@bryanbrattlof.com> In-Reply-To: <20210428175520.GA8921@user> References: <20210428175520.GA8921@user> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 28, 2021 at 11:25:20PM +0530, Saurav Girepunje wrote: >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 >--- > drivers/staging/rtl8723bs/include/osdep_intf.h | 2 +- > drivers/staging/rtl8723bs/os_dep/os_intfs.c | 5 ++--- > drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 4 +++- > 3 files changed, 6 insertions(+), 5 deletions(-) > >diff --git a/drivers/staging/rtl8723bs/include/osdep_intf.h b/drivers/stag= ing/rtl8723bs/include/osdep_intf.h >index 48c90f00cc2e..111e0179712a 100644 >--- 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 1f34cb2e367c..724909078d80 100644 >--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c >+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c >@@ -1146,14 +1146,13 @@ static void rtw_suspend_normal(struct adapter *pad= apter) > =09=09padapter->intf_deinit(adapter_to_dvobj(padapter)); > } > >-int rtw_suspend_common(struct adapter *padapter) >+void rtw_suspend_common(struct adapter *padapter) > { > =09struct dvobj_priv *psdpriv =3D padapter->dvobj; > =09struct debug_priv *pdbgpriv =3D &psdpriv->drv_dbg; > =09struct pwrctrl_priv *pwrpriv =3D dvobj_to_pwrctl(psdpriv); > =09struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; > >-=09int ret =3D 0; > =09unsigned long start_time =3D jiffies; > > =09DBG_871X_LEVEL(_drv_always_, " suspend start\n"); >@@ -1196,7 +1195,7 @@ int rtw_suspend_common(struct adapter *padapter) > > exit: > >-=09return ret; >+=09return; > } > Hi Saurav Now that this function doesn't return anything, we can also remove the `exit:` jump by replacing the `goto exit` on line 1175 with this return. -- ~Bryan > > static int rtw_resume_process_normal(struct adapter *padapter) >diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/stagin= g/rtl8723bs/os_dep/sdio_intf.c >index a9a9631dd23c..84c16925c4f5 100644 >--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c >+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c >@@ -452,7 +452,9 @@ static int rtw_sdio_suspend(struct device *dev) > =09=09return 0; > =09} > >-=09return rtw_suspend_common(padapter); >+=09rtw_suspend_common(padapter); >+ >+=09return 0; > } > > static int rtw_resume_process(struct adapter *padapter) >-- >2.25.1 >