On Thu 31 Mar 15:33 PDT 2022, Bart Van Assche wrote:
> Remove "? true : false" if the preceding expression yields a boolean or if
> the result of the expression is assigned to a boolean since in these two
> cases the "? true : false" part is superfluous.
>
> Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
> ---
> drivers/scsi/ufs/ufs-qcom.c | 3 +--
> drivers/scsi/ufs/ufshcd.c | 9 ++++-----
> drivers/scsi/ufs/ufshcd.h | 2 +-
> 3 files changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
> index 0d2e950d0865..808b677f6083 100644
> --- a/drivers/scsi/ufs/ufs-qcom.c
> +++ b/drivers/scsi/ufs/ufs-qcom.c
> @@ -299,8 +299,7 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)
> struct ufs_qcom_host *host = ufshcd_get_variant(hba);
> struct phy *phy = host->generic_phy;
> int ret = 0;
> - bool is_rate_B = (UFS_QCOM_LIMIT_HS_RATE == PA_HS_MODE_B)
> - ? true : false;
> + bool is_rate_B = UFS_QCOM_LIMIT_HS_RATE == PA_HS_MODE_B;
UFS_QCOM_LIMIT_HS_RATE is defined as PA_HS_MODE_B. I wonder if this is
expected to change at some point, or if we could clean this up further
(in a future change).
Regards,
Bjorn
>
> /* Reset UFS Host Controller and PHY */
> ret = ufs_qcom_host_reset(hba);
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index dbf50b50870b..983fac14b7cd 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -712,8 +712,7 @@ static inline u32 ufshcd_get_ufs_version(struct ufs_hba *hba)
> */
> static inline bool ufshcd_is_device_present(struct ufs_hba *hba)
> {
> - return (ufshcd_readl(hba, REG_CONTROLLER_STATUS) &
> - DEVICE_PRESENT) ? true : false;
> + return ufshcd_readl(hba, REG_CONTROLLER_STATUS) & DEVICE_PRESENT;
> }
>
> /**
> @@ -840,7 +839,7 @@ ufshcd_get_rsp_upiu_data_seg_len(struct utp_upiu_rsp *ucd_rsp_ptr)
> static inline bool ufshcd_is_exception_event(struct utp_upiu_rsp *ucd_rsp_ptr)
> {
> return be32_to_cpu(ucd_rsp_ptr->header.dword_2) &
> - MASK_RSP_EXCEPTION_EVENT ? true : false;
> + MASK_RSP_EXCEPTION_EVENT;
> }
>
> /**
> @@ -1350,7 +1349,7 @@ static int ufshcd_devfreq_target(struct device *dev,
> }
>
> /* Decide based on the rounded-off frequency and update */
> - scale_up = (*freq == clki->max_freq) ? true : false;
> + scale_up = *freq == clki->max_freq;
> if (!scale_up)
> *freq = clki->min_freq;
> /* Update the frequency */
> @@ -2800,7 +2799,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
> lrbp->sense_buffer = cmd->sense_buffer;
> lrbp->task_tag = tag;
> lrbp->lun = ufshcd_scsi_to_upiu_lun(cmd->device->lun);
> - lrbp->intr_cmd = !ufshcd_is_intr_aggr_allowed(hba) ? true : false;
> + lrbp->intr_cmd = !ufshcd_is_intr_aggr_allowed(hba);
>
> ufshcd_prepare_lrbp_crypto(scsi_cmd_to_rq(cmd), lrbp);
>
> diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
> index 949427714d0e..b2740b51a546 100644
> --- a/drivers/scsi/ufs/ufshcd.h
> +++ b/drivers/scsi/ufs/ufshcd.h
> @@ -985,7 +985,7 @@ static inline bool ufshcd_is_auto_hibern8_supported(struct ufs_hba *hba)
>
> static inline bool ufshcd_is_auto_hibern8_enabled(struct ufs_hba *hba)
> {
> - return FIELD_GET(UFSHCI_AHIBERN8_TIMER_MASK, hba->ahit) ? true : false;
> + return FIELD_GET(UFSHCI_AHIBERN8_TIMER_MASK, hba->ahit);
> }
>
> static inline bool ufshcd_is_wb_allowed(struct ufs_hba *hba)
