Commit 51d1628f authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen

scsi: ufs: Remove superfluous boolean conversions

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.

Link: https://lore.kernel.org/r/20220419225811.4127248-4-bvanassche@acm.orgTested-by: default avatarBean Huo <beanhuo@micron.com>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
Reviewed-by: default avatarBean Huo <beanhuo@micron.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 59a57bb7
...@@ -299,8 +299,7 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba) ...@@ -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 ufs_qcom_host *host = ufshcd_get_variant(hba);
struct phy *phy = host->generic_phy; struct phy *phy = host->generic_phy;
int ret = 0; int ret = 0;
bool is_rate_B = (UFS_QCOM_LIMIT_HS_RATE == PA_HS_MODE_B) bool is_rate_B = UFS_QCOM_LIMIT_HS_RATE == PA_HS_MODE_B;
? true : false;
/* Reset UFS Host Controller and PHY */ /* Reset UFS Host Controller and PHY */
ret = ufs_qcom_host_reset(hba); ret = ufs_qcom_host_reset(hba);
......
...@@ -712,8 +712,7 @@ static inline u32 ufshcd_get_ufs_version(struct ufs_hba *hba) ...@@ -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) static inline bool ufshcd_is_device_present(struct ufs_hba *hba)
{ {
return (ufshcd_readl(hba, REG_CONTROLLER_STATUS) & return ufshcd_readl(hba, REG_CONTROLLER_STATUS) & DEVICE_PRESENT;
DEVICE_PRESENT) ? true : false;
} }
/** /**
...@@ -840,7 +839,7 @@ ufshcd_get_rsp_upiu_data_seg_len(struct utp_upiu_rsp *ucd_rsp_ptr) ...@@ -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) static inline bool ufshcd_is_exception_event(struct utp_upiu_rsp *ucd_rsp_ptr)
{ {
return be32_to_cpu(ucd_rsp_ptr->header.dword_2) & 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, ...@@ -1350,7 +1349,7 @@ static int ufshcd_devfreq_target(struct device *dev,
} }
/* Decide based on the rounded-off frequency and update */ /* 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) if (!scale_up)
*freq = clki->min_freq; *freq = clki->min_freq;
/* Update the frequency */ /* Update the frequency */
...@@ -2800,7 +2799,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) ...@@ -2800,7 +2799,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
lrbp->sense_buffer = cmd->sense_buffer; lrbp->sense_buffer = cmd->sense_buffer;
lrbp->task_tag = tag; lrbp->task_tag = tag;
lrbp->lun = ufshcd_scsi_to_upiu_lun(cmd->device->lun); 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); ufshcd_prepare_lrbp_crypto(scsi_cmd_to_rq(cmd), lrbp);
......
...@@ -983,7 +983,7 @@ static inline bool ufshcd_is_auto_hibern8_supported(struct ufs_hba *hba) ...@@ -983,7 +983,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) 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) static inline bool ufshcd_is_wb_allowed(struct ufs_hba *hba)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment