Skip to content

Commit b5d9da5

Browse files
bvanasschemartinkpetersen
authored andcommitted
scsi: ufs: core: Simplify ufshcd_exception_event_handler()
The ufshcd_scsi_block_requests() and ufshcd_scsi_unblock_requests() calls were introduced in ufshcd_exception_event_handler() to prevent that querying the exception event information would time out. Commit 10fe588 ("scsi: ufs: increase the scsi query response timeout") increased the timeout for querying exception information from 30 ms to 1.5 s and thereby eliminated the risk that a timeout would happen. Hence, the calls to block and unblock SCSI requests are superfluous. Remove these calls. Reviewed-by: Peter Wang <peter.wang@mediatek.com> Tested-by: Avri Altman <avri.altman@wdc.com> Signed-off-by: Bart Van Assche <bvanassche@acm.org> Link: https://lore.kernel.org/r/20241022193130.2733293-5-bvanassche@acm.org Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 9a5f6c0 commit b5d9da5

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

drivers/ufs/core/ufshcd.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6194,12 +6194,11 @@ static void ufshcd_exception_event_handler(struct work_struct *work)
61946194
u32 status = 0;
61956195
hba = container_of(work, struct ufs_hba, eeh_work);
61966196

6197-
ufshcd_scsi_block_requests(hba);
61986197
err = ufshcd_get_ee_status(hba, &status);
61996198
if (err) {
62006199
dev_err(hba->dev, "%s: failed to get exception status %d\n",
62016200
__func__, err);
6202-
goto out;
6201+
return;
62036202
}
62046203

62056204
trace_ufshcd_exception_event(dev_name(hba->dev), status);
@@ -6211,8 +6210,6 @@ static void ufshcd_exception_event_handler(struct work_struct *work)
62116210
ufshcd_temp_exception_event_handler(hba, status);
62126211

62136212
ufs_debugfs_exception_event(hba, status);
6214-
out:
6215-
ufshcd_scsi_unblock_requests(hba);
62166213
}
62176214

62186215
/* Complete requests that have door-bell cleared */

0 commit comments

Comments
 (0)