diff options
| author | John Garry <john.g.garry@oracle.com> | 2023-08-15 11:51:51 +0000 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2023-08-21 17:50:58 -0400 |
| commit | 31d9061b475c0b05b69126e6c2c063c98fa7bd8e (patch) | |
| tree | 4324cf1a440b9708ad4c5ecd04ab5e6c5d5d4c86 | |
| parent | 1136a0225d0582c4464fa37e3a91ed4b19b8745e (diff) | |
| download | linux-31d9061b475c0b05b69126e6c2c063c98fa7bd8e.tar.gz linux-31d9061b475c0b05b69126e6c2c063c98fa7bd8e.tar.bz2 linux-31d9061b475c0b05b69126e6c2c063c98fa7bd8e.zip | |
scsi: libsas: Delete sas_ssp_task.retry_count
Since libsas was introduced in commit 2908d778ab3e ("[SCSI] aic94xx: new
driver"), sas_ssp_task.retry_count is only ever set, so delete it.
The aic94xx driver also had its own retry_count definition in struct scb
sub-structs, which may have caused a mix-up.
Signed-off-by: John Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20230815115156.343535-6-john.g.garry@oracle.com
Reviewed-by: Jason Yan <yanaijie@huawei.com>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
| -rw-r--r-- | drivers/scsi/libsas/sas_ata.c | 1 | ||||
| -rw-r--r-- | drivers/scsi/libsas/sas_scsi_host.c | 1 | ||||
| -rw-r--r-- | include/scsi/libsas.h | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index 2d29154ca8ef..ed9af2b401ef 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c @@ -201,7 +201,6 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc) task->data_dir = qc->dma_dir; } task->scatter = qc->sg; - task->ata_task.retry_count = 1; qc->lldd_task = task; task->ata_task.use_ncq = ata_is_ncq(qc->tf.protocol); diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c index 86b5d6b87282..0c103f4523b8 100644 --- a/drivers/scsi/libsas/sas_scsi_host.c +++ b/drivers/scsi/libsas/sas_scsi_host.c @@ -142,7 +142,6 @@ static struct sas_task *sas_create_task(struct scsi_cmnd *cmd, task->dev = dev; task->task_proto = task->dev->tproto; /* BUG_ON(!SSP) */ - task->ssp_task.retry_count = 1; int_to_scsilun(cmd->device->lun, &lun); memcpy(task->ssp_task.LUN, &lun.scsi_lun, 8); task->ssp_task.task_attr = TASK_ATTR_SIMPLE; diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index d42bfdff7812..d8222c442640 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -563,8 +563,6 @@ enum task_attribute { }; struct sas_ssp_task { - u8 retry_count; /* hardware retry, should be > 0 */ - u8 LUN[8]; u8 enable_first_burst:1; enum task_attribute task_attr; |