On Mon, Jul 01, 2024 at 07:57:55PM +0000, Igor Pylypiv wrote:
> ATA device id is not used in ata_to_sense_error().
>
> Reviewed-by: Hannes Reinecke <hare@xxxxxxx>
> Reviewed-by: Damien Le Moal <dlemoal@xxxxxxxxxx>
> Signed-off-by: Igor Pylypiv <ipylypiv@xxxxxxxxxx>
> ---
> drivers/ata/libata-scsi.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
> index c11ae77d3ca6..92d75780fc3b 100644
> --- a/drivers/ata/libata-scsi.c
> +++ b/drivers/ata/libata-scsi.c
> @@ -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 {
> --
> 2.45.2.803.g4e1b14247a-goog
>
Reviewed-by: Niklas Cassel <cassel@xxxxxxxxxx>
