Skip to content

Commit ea3b26a

Browse files
ipylypivfloatious
authored andcommitted
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: Hannes Reinecke <[email protected]> Reviewed-by: Damien Le Moal <[email protected]> Reviewed-by: Niklas Cassel <[email protected]> Signed-off-by: Igor Pylypiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Niklas Cassel <[email protected]>
1 parent 3f6d903 commit ea3b26a

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

drivers/ata/libata-scsi.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,6 @@ static void ata_qc_set_pc_nbytes(struct ata_queued_cmd *qc)
785785

786786
/**
787787
* ata_to_sense_error - convert ATA error to SCSI error
788-
* @id: ATA device number
789788
* @drv_stat: value contained in ATA status register
790789
* @drv_err: value contained in ATA error register
791790
* @sk: the sense key we'll fill out
@@ -799,8 +798,8 @@ static void ata_qc_set_pc_nbytes(struct ata_queued_cmd *qc)
799798
* LOCKING:
800799
* spin_lock_irqsave(host lock)
801800
*/
802-
static void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk,
803-
u8 *asc, u8 *ascq)
801+
static void ata_to_sense_error(u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc,
802+
u8 *ascq)
804803
{
805804
int i;
806805

@@ -934,7 +933,7 @@ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc)
934933
*/
935934
if (qc->err_mask ||
936935
tf->status & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {
937-
ata_to_sense_error(qc->ap->print_id, tf->status, tf->error,
936+
ata_to_sense_error(tf->status, tf->error,
938937
&sense_key, &asc, &ascq);
939938
ata_scsi_set_sense(qc->dev, cmd, sense_key, asc, ascq);
940939
} else {
@@ -973,7 +972,7 @@ static void ata_gen_ata_sense(struct ata_queued_cmd *qc)
973972
*/
974973
if (qc->err_mask ||
975974
tf->status & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {
976-
ata_to_sense_error(qc->ap->print_id, tf->status, tf->error,
975+
ata_to_sense_error(tf->status, tf->error,
977976
&sense_key, &asc, &ascq);
978977
ata_scsi_set_sense(dev, cmd, sense_key, asc, ascq);
979978
} else {

0 commit comments

Comments
 (0)