Before patch "scsi: ufs: Optimize host lock on transfer requests send/compl paths", the host lock was held around __ufshcd_transfer_req_compl() and the double underscore prefix indicated this. Since the SCSI host lock is no longer held around __ufshcd_transfer_req_compl() calls, remove the double underscore prefix. Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx> Cc: Stanley Chu <stanley.chu@xxxxxxxxxxxx> Cc: Can Guo <cang@xxxxxxxxxxxxxx> Cc: Asutosh Das <asutoshd@xxxxxxxxxxxxxx> Cc: Avri Altman <avri.altman@xxxxxxx> Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx> --- drivers/scsi/ufs/ufshcd.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 2acf168bc339..0b7359e0b445 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -5180,12 +5180,12 @@ static irqreturn_t ufshcd_uic_cmd_compl(struct ufs_hba *hba, u32 intr_status) } /** - * __ufshcd_transfer_req_compl - handle SCSI and query command completion + * ufshcd_transfer_req_compl - handle SCSI and query command completion * @hba: per adapter instance * @completed_reqs: requests to complete */ -static void __ufshcd_transfer_req_compl(struct ufs_hba *hba, - unsigned long completed_reqs) +static void ufshcd_transfer_req_compl(struct ufs_hba *hba, + unsigned long completed_reqs) { struct ufshcd_lrb *lrbp; struct scsi_cmnd *cmd; @@ -5270,7 +5270,7 @@ static irqreturn_t ufshcd_trc_handler(struct ufs_hba *hba, bool use_utrlcnr) } if (completed_reqs) { - __ufshcd_transfer_req_compl(hba, completed_reqs); + ufshcd_transfer_req_compl(hba, completed_reqs); return IRQ_HANDLED; } else { return IRQ_NONE; @@ -6808,7 +6808,7 @@ static int ufshcd_eh_device_reset_handler(struct scsi_cmnd *cmd) err = ufshcd_clear_cmd(hba, pos); if (err) break; - __ufshcd_transfer_req_compl(hba, pos); + ufshcd_transfer_req_compl(hba, pos); } } @@ -6981,7 +6981,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) */ if (lrbp->lun == UFS_UPIU_UFS_DEVICE_WLUN) { ufshcd_update_evt_hist(hba, UFS_EVT_ABORT, lrbp->lun); - __ufshcd_transfer_req_compl(hba, (1UL << tag)); + ufshcd_transfer_req_compl(hba, 1UL << tag); set_bit(tag, &hba->outstanding_reqs); spin_lock_irqsave(host->host_lock, flags); hba->force_reset = true; @@ -6998,7 +6998,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) if (!err) { cleanup: - __ufshcd_transfer_req_compl(hba, (1UL << tag)); + ufshcd_transfer_req_compl(hba, 1UL << tag); out: err = SUCCESS; } else {