[PATCH v2] scsi: ufs: Refactor ufshcd_is_intr_aggr_allowed()

[PATCH v2] scsi: ufs: Refactor ufshcd_is_intr_aggr_allowed()

[Keoseong Park]

Simplify if else statement to return statement,
and remove code related to CONFIG_SCSI_UFS_DWC that is not in use.

v1 -> v2
Remove code related to CONFIG_SCSI_UFS_DWC that is not in use.

Cc: Joao Pinto <jpinto@synopsys.com>
Signed-off-by: Keoseong Park <keosung.park@samsung.com>
---
 drivers/scsi/ufs/ufshcd.h | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index c98d540ac044..c9faca237290 100644
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -893,16 +893,8 @@ static inline bool ufshcd_is_rpm_autosuspend_allowed(struct ufs_hba *hba)
 
 static inline bool ufshcd_is_intr_aggr_allowed(struct ufs_hba *hba)
 {
-/* DWC UFS Core has the Interrupt aggregation feature but is not detectable*/
-#ifndef CONFIG_SCSI_UFS_DWC
-	if ((hba->caps & UFSHCD_CAP_INTR_AGGR) &&
-	    !(hba->quirks & UFSHCD_QUIRK_BROKEN_INTR_AGGR))
-		return true;
-	else
-		return false;
-#else
-return true;
-#endif
+	return (hba->caps & UFSHCD_CAP_INTR_AGGR) &&
+		!(hba->quirks & UFSHCD_QUIRK_BROKEN_INTR_AGGR);
 }
 
 static inline bool ufshcd_can_aggressive_pc(struct ufs_hba *hba)
-- 
2.17.1

Re: [PATCH v2] scsi: ufs: Refactor ufshcd_is_intr_aggr_allowed()

[Bean Huo]

On Mon, 2021-06-28 at 14:58 +0900, Keoseong Park wrote:
> Simplify if else statement to return statement,
> 
> and remove code related to CONFIG_SCSI_UFS_DWC that is not in use.
> 
> 
> 
> v1 -> v2
> 
> Remove code related to CONFIG_SCSI_UFS_DWC that is not in use.
> 
> 
> 
> Cc: Joao Pinto <jpinto@synopsys.com>
> 
> Signed-off-by: Keoseong Park <keosung.park@samsung.com>

Reviewed-by: Bean Huo <beanhuo@micron.com>

Re: [PATCH v2] scsi: ufs: Refactor ufshcd_is_intr_aggr_allowed()

[Bart Van Assche]

On 6/27/21 10:58 PM, Keoseong Park wrote:
> Simplify if else statement to return statement,
> and remove code related to CONFIG_SCSI_UFS_DWC that is not in use.
> 
> v1 -> v2
> Remove code related to CONFIG_SCSI_UFS_DWC that is not in use.
> 
> Cc: Joao Pinto <jpinto@synopsys.com>
> Signed-off-by: Keoseong Park <keosung.park@samsung.com>
> ---
>  drivers/scsi/ufs/ufshcd.h | 12 ++----------
>  1 file changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
> index c98d540ac044..c9faca237290 100644
> --- a/drivers/scsi/ufs/ufshcd.h
> +++ b/drivers/scsi/ufs/ufshcd.h
> @@ -893,16 +893,8 @@ static inline bool ufshcd_is_rpm_autosuspend_allowed(struct ufs_hba *hba)
>  
>  static inline bool ufshcd_is_intr_aggr_allowed(struct ufs_hba *hba)
>  {
> -/* DWC UFS Core has the Interrupt aggregation feature but is not detectable*/
> -#ifndef CONFIG_SCSI_UFS_DWC
> -	if ((hba->caps & UFSHCD_CAP_INTR_AGGR) &&
> -	    !(hba->quirks & UFSHCD_QUIRK_BROKEN_INTR_AGGR))
> -		return true;
> -	else
> -		return false;
> -#else
> -return true;
> -#endif
> +	return (hba->caps & UFSHCD_CAP_INTR_AGGR) &&
> +		!(hba->quirks & UFSHCD_QUIRK_BROKEN_INTR_AGGR);
>  }

Reviewed-by: Bart Van Assche <bvanassche@acm.org>

Re: [PATCH v2] scsi: ufs: Refactor ufshcd_is_intr_aggr_allowed()

[Martin K. Petersen]

Keoseong,

> Simplify if else statement to return statement, and remove code
> related to CONFIG_SCSI_UFS_DWC that is not in use.

Applied to 5.15/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH v2] scsi: ufs: Refactor ufshcd_is_intr_aggr_allowed()

[Martin K. Petersen]

On Mon, 28 Jun 2021 14:58:01 +0900, Keoseong Park wrote:

> Simplify if else statement to return statement,
> and remove code related to CONFIG_SCSI_UFS_DWC that is not in use.
> 
> v1 -> v2
> Remove code related to CONFIG_SCSI_UFS_DWC that is not in use.

Applied to 5.15/scsi-queue, thanks!

[1/1] scsi: ufs: Refactor ufshcd_is_intr_aggr_allowed()
      https://git.kernel.org/mkp/scsi/c/1c0810e79cb3

-- 
Martin K. Petersen	Oracle Linux Engineering