[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230814141022.36875-9-john.g.garry@oracle.com>
Date: Mon, 14 Aug 2023 14:10:20 +0000
From: John Garry <john.g.garry@...cle.com>
To: jejb@...ux.ibm.com, martin.petersen@...cle.com,
chenxiang66@...ilicon.com, artur.paszkiewicz@...el.com,
yanaijie@...wei.com, jinpu.wang@...ud.ionos.com
Cc: linux-scsi@...r.kernel.org, linux-kernel@...r.kernel.org,
dlemoal@...nel.org, John Garry <john.g.garry@...cle.com>
Subject: [PATCH 08/10] 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@...cle.com>
---
drivers/scsi/aic94xx/aic94xx_task.c | 7 +++----
include/scsi/libsas.h | 1 -
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
index f67983e8b262..ca435811c310 100644
--- 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 5b2e6932c564..3a52094090a1 100644
--- 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;
--
2.35.3
Powered by blists - more mailing lists