scsi: ufs: Remove unnecessary if condition in ufshcd_suspend()
diff mbox series

Message ID 20201125185300.3394-1-huobean@gmail.com
State Accepted
Commit 939785d35def8d10e8ad312b252dbbecc8d41ca1
Headers show
Series
  • scsi: ufs: Remove unnecessary if condition in ufshcd_suspend()
Related show

Commit Message

Bean Huo Nov. 25, 2020, 6:53 p.m. UTC
From: Bean Huo <beanhuo@micron.com>

In the case that auto_bkops_enable is false, which means auto bkops
has been disabled, so no need to call ufshcd_disable_auto_bkops().

Signed-off-by: Bean Huo <beanhuo@micron.com>
---
 drivers/scsi/ufs/ufshcd.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Stanley Chu Nov. 26, 2020, 1:08 a.m. UTC | #1
On Wed, 2020-11-25 at 19:53 +0100, Bean Huo wrote:
> From: Bean Huo <beanhuo@micron.com>
> 
> In the case that auto_bkops_enable is false, which means auto bkops
> has been disabled, so no need to call ufshcd_disable_auto_bkops().
> 
> Signed-off-by: Bean Huo <beanhuo@micron.com>

Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
Can Guo Nov. 26, 2020, 2:07 a.m. UTC | #2
On 2020-11-26 02:53, Bean Huo wrote:
> From: Bean Huo <beanhuo@micron.com>
> 
> In the case that auto_bkops_enable is false, which means auto bkops
> has been disabled, so no need to call ufshcd_disable_auto_bkops().
> 
> Signed-off-by: Bean Huo <beanhuo@micron.com>
> ---
>  drivers/scsi/ufs/ufshcd.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index 80cbce414678..d169db41ee16 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -8543,11 +8543,9 @@ static int ufshcd_suspend(struct ufs_hba *hba,
> enum ufs_pm_op pm_op)
>  	}
> 
>  	if (req_dev_pwr_mode != hba->curr_dev_pwr_mode) {
> -		if ((ufshcd_is_runtime_pm(pm_op) && !hba->auto_bkops_enabled) ||
> -		    !ufshcd_is_runtime_pm(pm_op)) {
> +		if (!ufshcd_is_runtime_pm(pm_op))
>  			/* ensure that bkops is disabled */
>  			ufshcd_disable_auto_bkops(hba);
> -		}
> 
>  		if (!hba->dev_info.b_rpm_dev_flush_capable) {
>  			ret = ufshcd_set_dev_pwr_mode(hba, req_dev_pwr_mode);

Reviewed-by: Can Guo <cang@codeaurora.org>
Martin K. Petersen Dec. 1, 2020, 4:44 a.m. UTC | #3
Bean,

> In the case that auto_bkops_enable is false, which means auto bkops
> has been disabled, so no need to call ufshcd_disable_auto_bkops().

Applied to 5.11/scsi-staging, thanks!

Patch
diff mbox series

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 80cbce414678..d169db41ee16 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -8543,11 +8543,9 @@  static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
 	}
 
 	if (req_dev_pwr_mode != hba->curr_dev_pwr_mode) {
-		if ((ufshcd_is_runtime_pm(pm_op) && !hba->auto_bkops_enabled) ||
-		    !ufshcd_is_runtime_pm(pm_op)) {
+		if (!ufshcd_is_runtime_pm(pm_op))
 			/* ensure that bkops is disabled */
 			ufshcd_disable_auto_bkops(hba);
-		}
 
 		if (!hba->dev_info.b_rpm_dev_flush_capable) {
 			ret = ufshcd_set_dev_pwr_mode(hba, req_dev_pwr_mode);