From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4976972 for ; Sun, 2 May 2021 16:09:25 +0000 (UTC) Received: by mail-pl1-f177.google.com with SMTP id a11so1526457plh.3 for ; Sun, 02 May 2021 09:09:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=WnKnLYa6L3aqa5GoFfmd9JLUCyztCoRGIMqS2sYZeyY=; b=u7c8qEk8tGKTWLrmMEMgQ3Q1hkXZTQJt9XHTHOyE7w31SpVXBevFFhXc7w/CXbaiNq QYX58lUpUeuYSl5Q+TWgfRl4S+cjfv1PL52iD1SOXnA1iIcNoFg3Ay846pbwAYg1LgEk VLm1hwH/Cz8n3D9qAIw8M0WmMRAgFURkZQhzYPfTOrv1e6OedggM/afSn+ylyN9AOI/4 MO1jEAXu4aK6o8lSV+CK4AFEZi0vPgcGDfnbM4/q22AL2jrlxk9Quu2wI+rBD3ILP3HD os9WD1S9kT7cTGERsAI3uPXA/HI7mvd2RreBTbARRqRvzDk5XOs7mN8LVCaxRR7US8h/ YOFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=WnKnLYa6L3aqa5GoFfmd9JLUCyztCoRGIMqS2sYZeyY=; b=ipBp428sDluKuAjr0EtCbhMGNGD4/DNuks2ZxzX0c0E/AjskGDZ+REbaENDbLhyi04 rb5ADYP+rc5Ih43WQtaKiVIuUubWDLJ3XZWxaqWsYYhckeUbZ9ng+h73HVRK+6yPnF4/ YDao+OUK3x7xUeshUY9EJfB9DanruugLseKECJbO2pEVYKc1kwLOnmUyqu8zMMWUB58i 7hKsr5A1JljWq3YePifAKZN9mgI1ae1ahhyurlbBIbsOjgAXvsrZPYodKwD/zONXpCc3 J9sft/ut2mMmpd8s+hQvedEiPECm/4rEajr/g/krn7opk0PyTDV93wPT+WkoHFpy7dC/ bXjw== X-Gm-Message-State: AOAM533vgcjKU+L+E1hKUHI7YXQsvj2r37TvPXlhZ+FbR6pH5UVkAngN D0wBXdKsgdVJUPFWCSNBbqc= X-Google-Smtp-Source: ABdhPJzp4FejfUBTZwBwD3Qt/uF7weVbThxKacLkzLher0piU4Z+y3LPMNbQN0iObdO/2fHq+QAavQ== X-Received: by 2002:a17:90a:8c03:: with SMTP id a3mr16150298pjo.187.1619971764767; Sun, 02 May 2021 09:09:24 -0700 (PDT) Received: from user ([2001:4490:4409:14d1:d6e9:983f:6cb8:c051]) by smtp.gmail.com with ESMTPSA id y14sm5860880pjr.51.2021.05.02.09.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 May 2021 09:09:23 -0700 (PDT) Date: Sun, 2 May 2021 21:39:15 +0530 From: SAURAV GIREPUNJE To: 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 Subject: Re: [PATCH] staging: rtl8723bs: Change the return type Message-ID: <20210502160915.GA5757@user> References: <20210428175520.GA8921@user> <20210429222721.rudewp22t55fkmgf@bryanbrattlof.com> X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210429222721.rudewp22t55fkmgf@bryanbrattlof.com> On Thu, Apr 29, 2021 at 10:27:33PM +0000, Bryan Brattlof wrote: > 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/staging/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 *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; > > > > DBG_871X_LEVEL(_drv_always_, " suspend start\n"); > >@@ -1196,7 +1195,7 @@ int rtw_suspend_common(struct adapter *padapter) > > > > exit: > > > >- return ret; > >+ return; > > } > > > > 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/staging/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) > > return 0; > > } > > > >- return rtw_suspend_common(padapter); > >+ rtw_suspend_common(padapter); > >+ > >+ return 0; > > } > > > > static int rtw_resume_process(struct adapter *padapter) > >-- > >2.25.1 > > > I think you are pointing to rtw_suspend_common function's goto statement. Yes, We can remove now. I will send a separate patch for removing goto statement. ~Saurav