Commit ea3b26a9 authored by Igor Pylypiv's avatar Igor Pylypiv Committed by Niklas Cassel
Browse files

ata: libata-scsi: Do not pass ATA device id to ata_to_sense_error() 



ATA device id is not used in ata_to_sense_error().

Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarNiklas Cassel <cassel@kernel.org>
Signed-off-by: default avatarIgor Pylypiv <ipylypiv@google.com>
Link: https://lore.kernel.org/r/20240702024735.1152293-6-ipylypiv@google.com


Signed-off-by: default avatarNiklas Cassel <cassel@kernel.org>
parent 3f6d903b

drivers/ata/libata-scsi.c

+4 −5
Original line number Diff line number Diff line
@@ -785,7 +785,6 @@ static void ata_qc_set_pc_nbytes(struct ata_queued_cmd *qc) 


/**

 *	ata_to_sense_error - convert ATA error to SCSI error

 *	@id: ATA device number

 *	@drv_stat: value contained in ATA status register

 *	@drv_err: value contained in ATA error register

 *	@sk: the sense key we'll fill out
@@ -799,8 +798,8 @@ static void ata_qc_set_pc_nbytes(struct ata_queued_cmd *qc) 
 *	LOCKING:

 *	spin_lock_irqsave(host lock)

 */

static void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk,

			       u8 *asc, u8 *ascq)

static void ata_to_sense_error(u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc,

			       u8 *ascq)

{

	int i;
@@ -934,7 +933,7 @@ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc) 
	 */

	if (qc->err_mask ||

	    tf->status & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {

		ata_to_sense_error(qc->ap->print_id, tf->status, tf->error,

		ata_to_sense_error(tf->status, tf->error,

				   &sense_key, &asc, &ascq);

		ata_scsi_set_sense(qc->dev, cmd, sense_key, asc, ascq);

	} else {
@@ -973,7 +972,7 @@ static void ata_gen_ata_sense(struct ata_queued_cmd *qc) 
	 */

	if (qc->err_mask ||

	    tf->status & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {

		ata_to_sense_error(qc->ap->print_id, tf->status, tf->error,

		ata_to_sense_error(tf->status, tf->error,

				   &sense_key, &asc, &ascq);

		ata_scsi_set_sense(dev, cmd, sense_key, asc, ascq);

	} else {