scsi: libsas: Delete sas_ata_task.retry_count
authorJohn Garry <john.g.garry@oracle.com>
Tue, 15 Aug 2023 11:51:56 +0000 (11:51 +0000)
committerMartin K. Petersen <martin.petersen@oracle.com>
Mon, 21 Aug 2023 21:50:59 +0000 (17:50 -0400)
Since libsas was introduced in commit 2908d778ab3e ("[SCSI] aic94xx: new
driver"), sas_ata_task.retry_count is never set, so delete it and the
reference in asd_build_ata_ascb().

Signed-off-by: John Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20230815115156.343535-11-john.g.garry@oracle.com
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Jason Yan <yanaijie@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/aic94xx/aic94xx_task.c
include/scsi/libsas.h

index 21b69e5..4bfd037 100644 (file)
@@ -388,7 +388,7 @@ static int asd_build_ata_ascb(struct asd_ascb *ascb, struct sas_task *task,
                flags |= data_dir_flags[task->data_dir];
                scb->ata_task.ata_flags = flags;
 
-               scb->ata_task.retry_count = task->ata_task.retry_count;
+               scb->ata_task.retry_count = 0;
 
                scb->ata_task.flags = 0;
        }
index a65c166..2601f57 100644 (file)
@@ -525,8 +525,6 @@ struct sas_ata_task {
        struct host_to_dev_fis fis;
        u8     atapi_packet[16];  /* 0 if not ATAPI task */
 
-       u8     retry_count;       /* hardware retry, should be > 0 */
-
        u8     dma_xfer:1;        /* PIO:0 or DMA:1 */
        u8     use_ncq:1;