Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

torvalds · torvalds · commit 00b827f0cffa · 2025-05-02T11:14:58.000-07:00
Pull SCSI fixes from James Bottomley:
 "Two minor updates, both in drivers"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: ufs: core: Remove redundant query_complete trace
  scsi: myrb: Fix spelling mistake "statux" -&gt; "status"
diff --git a/drivers/scsi/myrb.c b/drivers/scsi/myrb.c
@@ -891,7 +891,7 @@ static bool myrb_enable_mmio(struct myrb_hba *cb, mbox_mmio_init_t mmio_init_fn)
 		status = mmio_init_fn(pdev, base, &mbox);
 		if (status != MYRB_STATUS_SUCCESS) {
 			dev_err(&pdev->dev,
-				"Failed to enable mailbox, statux %02X\n",
+				"Failed to enable mailbox, status %02X\n",
 				status);
 			return false;
 		}
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
@@ -7265,8 +7265,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,
 			err = -EINVAL;
 		}
 	}
-	ufshcd_add_query_upiu_trace(hba, err ? UFS_QUERY_ERR : UFS_QUERY_COMP,
-				    (struct utp_upiu_req *)lrbp->ucd_rsp_ptr);
 
 	return err;
 }

Original file line number	Diff line number	Diff line change
`@@ -891,7 +891,7 @@ static bool myrb_enable_mmio(struct myrb_hba *cb, mbox_mmio_init_t mmio_init_fn)`
`891`	`891`	`status = mmio_init_fn(pdev, base, &mbox);`
`892`	`892`	`if (status != MYRB_STATUS_SUCCESS) {`
`893`	`893`	`dev_err(&pdev->dev,`
`894`		`- "Failed to enable mailbox, statux %02X\n",`
	`894`	`+ "Failed to enable mailbox, status %02X\n",`
`895`	`895`	`status);`
`896`	`896`	`return false;`
`897`	`897`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7265,8 +7265,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,`
`7265`	`7265`	`err = -EINVAL;`
`7266`	`7266`	`}`
`7267`	`7267`	`}`
`7268`		`- ufshcd_add_query_upiu_trace(hba, err ? UFS_QUERY_ERR : UFS_QUERY_COMP,`
`7269`		`- (struct utp_upiu_req *)lrbp->ucd_rsp_ptr);`
`7270`	`7268`
`7271`	`7269`	`return err;`
`7272`	`7270`	`}`