Hi Martin, This patch series includes several fixes and cleanup patches for the UFS driver. Please consider this patch series for the next merge window. Thanks, Bart. Changes compared to v1: - Reworked patch 4. Instead of changing ufshcd_scsi_block_requests() into blk_mq_quiesce_tagset(), remove the calls for blocking and unblocking SCSI requests. - Made the patch description of patch 6 more detailed. - Dropped patch 7 from this series and posted it separately. Bart Van Assche (6): scsi: ufs: core: Move the ufshcd_mcq_enable_esi() definition scsi: ufs: core: Remove goto statements from ufshcd_try_to_abort_task() scsi: ufs: core: Simplify ufshcd_try_to_abort_task() scsi: ufs: core: Simplify ufshcd_exception_event_handler() scsi: ufs: core: Simplify ufshcd_err_handling_prepare() scsi: ufs: core: Improve ufshcd_mcq_sq_cleanup() drivers/ufs/core/ufs-mcq.c | 26 ++++++++------ drivers/ufs/core/ufshcd.c | 73 ++++++++++---------------------------- include/ufs/ufshcd.h | 4 +-- 3 files changed, 34 insertions(+), 69 deletions(-)