From: Martin K. Petersen Date: Thu, 1 Jun 2023 00:35:48 +0000 (-0400) Subject: Merge patch series "UFS host controller driver patches" X-Git-Tag: v6.5-rc1~115^2~24 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=467e6cc73ef290f0099b1b86cec4f14060984916;p=thirdparty%2Fkernel%2Flinux.git Merge patch series "UFS host controller driver patches" Bart Van Assche says: Please consider these four UFS host controller driver patches for the next merge window. Link: https://lore.kernel.org/r/20230524203659.1394307-1-bvanassche@acm.org Signed-off-by: Martin K. Petersen --- 467e6cc73ef290f0099b1b86cec4f14060984916 diff --cc drivers/ufs/core/ufshcd.c index ab00305be4120,00f730671f4b8..ab1255bd8b7f4 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@@ -2896,10 -2936,15 +2896,9 @@@ static int ufshcd_queuecommand(struct S hba->req_abort_count = 0; - err = ufshcd_hold(hba, true); - if (err) { - err = SCSI_MLQUEUE_HOST_BUSY; - goto out; - } - WARN_ON(ufshcd_is_clkgating_allowed(hba) && - (hba->clk_gating.state != CLKS_ON)); + ufshcd_hold(hba); lrbp = &hba->lrb[tag]; - WARN_ON(lrbp->cmd); lrbp->cmd = cmd; lrbp->task_tag = tag; lrbp->lun = ufshcd_scsi_to_upiu_lun(cmd->device->lun);