Hi Martin, Please consider this series of UFS driver patches for the next merge window. Thank you, Bart. Changes compared to v2: - In patch 1/7, remove more duplicate declarations. Changes compared to v1: - Based upon reviewer feedback, a new patch that renames the MASK_TRANSFER_REQUESTS_SLOTS constant has been added. - Because there is no agreement about these patches, the following three patches have been left out: "Make ufshcd_poll() complain about unsupported arguments", "Make the polling code report which command has been completed" and also "Check for completion from the timeout handler". Bart Van Assche (7): scsi: ufs: Declare functions once scsi: ufs: Initialize struct uic_command once scsi: ufs: Remove two constants scsi: ufs: Rename the MASK_TRANSFER_REQUESTS_SLOTS constant scsi: ufs: Initialize hba->reserved_slot earlier scsi: ufs: Inline ufshcd_mcq_vops_get_hba_mac() scsi: ufs: Make .get_hba_mac() optional drivers/ufs/core/ufs-mcq.c | 19 ++++++--- drivers/ufs/core/ufshcd-priv.h | 14 ------- drivers/ufs/core/ufshcd.c | 73 ++++++++++++++++------------------ include/ufs/ufshcd.h | 8 ++-- include/ufs/ufshci.h | 3 +- 5 files changed, 55 insertions(+), 62 deletions(-)