Skip to content

Commit

Permalink
scsi: libsas: Delete sas_ssp_task.retry_count
Browse files Browse the repository at this point in the history
Since libsas was introduced in commit 2908d77 ("[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>
  • Loading branch information
johnpgarry authored and martinkpetersen committed Aug 21, 2023
1 parent 1136a02 commit 31d9061
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 4 deletions.
1 change: 0 additions & 1 deletion drivers/scsi/libsas/sas_ata.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion drivers/scsi/libsas/sas_scsi_host.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions include/scsi/libsas.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 31d9061

Please sign in to comment.