Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Mime-Version: 1.0
Subject: RE: [PATCH] scsi: ufs: core: Use 'else' in ufshcd_hba_enable()
Reply-To: keosung.park@samsung.com
Sender: Keoseong Park <keosung.park@samsung.com>
From:   Keoseong Park <keosung.park@samsung.com>
To:     Bart Van Assche <bvanassche@acm.org>,
        ALIM AKHTAR <alim.akhtar@samsung.com>,
        "avri.altman@wdc.com" <avri.altman@wdc.com>,
        "jejb@linux.ibm.com" <jejb@linux.ibm.com>,
        "martin.petersen@oracle.com" <martin.petersen@oracle.com>,
        "beanhuo@micron.com" <beanhuo@micron.com>,
        "adrian.hunter@intel.com" <adrian.hunter@intel.com>,
        Jinyoung CHOI <j-young.choi@samsung.com>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
In-Reply-To: <87a0d265-f9b3-dbc6-edff-396c5a354f92@acm.org>
Message-ID: <20221028000555epcms2p7f1660c757d0af8399af64fa31bd87cb1@epcms2p7>
Date:   Fri, 28 Oct 2022 09:05:55 +0900
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
CMS-TYPE: 102P
DLP-Filter: Pass
References: <87a0d265-f9b3-dbc6-edff-396c5a354f92@acm.org>
        <20221027062013epcms2p7af8fbc60caaba50686233492fb3dfd93@epcms2p7>
        <CGME20221027062013epcms2p7af8fbc60caaba50686233492fb3dfd93@epcms2p7>
Precedence: bulk

Hi Bart,

>On 10/26/22 23:20, Keoseong Park wrote:
>> Convert if (!ret) { ... } if (ret) { ... } into
>> if (!ret) { ... } else { ... }.
>> 
>> Signed-off-by: Keoseong Park <keosung.park@samsung.com>
>> ---
>>   drivers/ufs/core/ufshcd.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
>> index 7256e6c43ca6..3b794be53287 100644
>> --- a/drivers/ufs/core/ufshcd.c
>> +++ b/drivers/ufs/core/ufshcd.c
>> @@ -4670,7 +4670,7 @@ int ufshcd_hba_enable(struct ufs_hba *hba)
>>   			ret = ufshcd_dme_enable(hba);
>>   			if (!ret)
>>   				ufshcd_vops_hce_enable_notify(hba, POST_CHANGE);
>> -			if (ret)
>> +			else
>>   				dev_err(hba->dev,
>>   					"Host controller enable failed with non-hce\n");
>>   		}
>
>If ufshcd_hba_enable() is modified it should be converted into the widely
>used "if error return" style. How about the untested patch below?

Thanks for your feedback.
That seems to be better.
I will apply it to the next version.

Best Regards,
Keoseong

>
>diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
>index 05feec10fad3..89f8b86c3f85 100644
>--- a/drivers/ufs/core/ufshcd.c
>+++ b/drivers/ufs/core/ufshcd.c
>@@ -4668,14 +4668,16 @@ int ufshcd_hba_enable(struct ufs_hba *hba)
>  		/* enable UIC related interrupts */
>  		ufshcd_enable_intr(hba, UFSHCD_UIC_MASK);
>  		ret = ufshcd_dme_reset(hba);
>-		if (!ret) {
>-			ret = ufshcd_dme_enable(hba);
>-			if (!ret)
>-				ufshcd_vops_hce_enable_notify(hba, POST_CHANGE);
>-			if (ret)
>-				dev_err(hba->dev,
>-					"Host controller enable failed with non-hce\n");
>+		if (ret) {
>+			dev_err(hba->dev, "DME_RESET failed\n");
>+			return ret;
>+		}
>+		ret = ufshcd_dme_enable(hba);
>+		if (ret) {
>+			dev_err(hba->dev, "Enabling DME failed\n");
>+			return ret;
>  		}
>+		ufshcd_vops_hce_enable_notify(hba, POST_CHANGE);
>  	} else {
>  		ret = ufshcd_hba_execute_hce(hba);
>  	}