scsi: libsas: Delete sas_ata_task.set_affil_pol

Since libsas was introduced in commit 2908d778ab3e ("[SCSI] aic94xx: new
driver"), sas_ata_task.set_affil_pol 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-9-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>

diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
index f67983e8b26224e90e6e009a351bd12b23145458..ca435811c3107bc46a22df936c8345369a4fb33b 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx_task.c
+++ b/drivers/scsi/aic94xx/aic94xx_task.c
@@ -390,11 +390,10 @@ static int asd_build_ata_ascb(struct asd_ascb *ascb, struct sas_task *task,
 
                scb->ata_task.retry_count = task->ata_task.retry_count;
 
-               flags = 0;
-               if (task->ata_task.set_affil_pol)
-                       flags |= SET_AFFIL_POLICY;
                if (task->ata_task.stp_affil_pol)
-                       flags |= STP_AFFIL_POLICY;
+                       flags = STP_AFFIL_POLICY;
+               else
+                       flags = 0;
                scb->ata_task.flags = flags;
        }
        ascb->tasklet_complete = asd_task_tasklet_complete;

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 5b2e6932c5646df6e33df318ce4468acf7d33557..3a52094090a15779d4bf7f2468590e5a6b07a6e5 100644 (file)
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -529,7 +529,6 @@ struct sas_ata_task {
 
        u8     dma_xfer:1;        /* PIO:0 or DMA:1 */
        u8     use_ncq:1;
-       u8     set_affil_pol:1;
        u8     stp_affil_pol:1;
 
        u8     device_control_reg_update:1;