Commit c788cf8a authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: ufs: core: Simplify ufshcd_comp_scsi_upiu() 



ufshcd_comp_scsi_upiu() has one caller and that caller ensures that
lrbp->cmd != NULL. Hence leave out the lrbp->cmd check from
ufshcd_comp_scsi_upiu().

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20230921192335.676924-4-bvanassche@acm.org


Reviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 858231bd

drivers/ufs/core/ufshcd.c

+4 −12
Original line number Diff line number Diff line
@@ -2714,27 +2714,19 @@ static int ufshcd_compose_devman_upiu(struct ufs_hba *hba, 
 *			   for SCSI Purposes

 * @hba: per adapter instance

 * @lrbp: pointer to local reference block

 *

 * Return: 0 upon success; < 0 upon failure.

 */

static int ufshcd_comp_scsi_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)

static void ufshcd_comp_scsi_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)

{

	u8 upiu_flags;

	int ret = 0;



	if (hba->ufs_version <= ufshci_version(1, 1))

		lrbp->command_type = UTP_CMD_TYPE_SCSI;

	else

		lrbp->command_type = UTP_CMD_TYPE_UFS_STORAGE;



	if (likely(lrbp->cmd)) {

		ufshcd_prepare_req_desc_hdr(lrbp, &upiu_flags, lrbp->cmd->sc_data_direction, 0);

	ufshcd_prepare_req_desc_hdr(lrbp, &upiu_flags,

				    lrbp->cmd->sc_data_direction, 0);

	ufshcd_prepare_utp_scsi_cmd_upiu(lrbp, upiu_flags);

	} else {

		ret = -EINVAL;

	}



	return ret;

}



/**