Skip to content

Commit 31d9061

Browse files
johnpgarrymartinkpetersen
authored andcommitted
scsi: libsas: Delete sas_ssp_task.retry_count
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Jason Yan <[email protected]> Reviewed-by: Damien Le Moal <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 1136a02 commit 31d9061

File tree

3 files changed

+0
-4
lines changed

3 files changed

+0
-4
lines changed

drivers/scsi/libsas/sas_ata.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
201201
task->data_dir = qc->dma_dir;
202202
}
203203
task->scatter = qc->sg;
204-
task->ata_task.retry_count = 1;
205204
qc->lldd_task = task;
206205

207206
task->ata_task.use_ncq = ata_is_ncq(qc->tf.protocol);

drivers/scsi/libsas/sas_scsi_host.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ static struct sas_task *sas_create_task(struct scsi_cmnd *cmd,
142142
task->dev = dev;
143143
task->task_proto = task->dev->tproto; /* BUG_ON(!SSP) */
144144

145-
task->ssp_task.retry_count = 1;
146145
int_to_scsilun(cmd->device->lun, &lun);
147146
memcpy(task->ssp_task.LUN, &lun.scsi_lun, 8);
148147
task->ssp_task.task_attr = TASK_ATTR_SIMPLE;

include/scsi/libsas.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,8 +563,6 @@ enum task_attribute {
563563
};
564564

565565
struct sas_ssp_task {
566-
u8 retry_count; /* hardware retry, should be > 0 */
567-
568566
u8 LUN[8];
569567
u8 enable_first_burst:1;
570568
enum task_attribute task_attr;

0 commit comments

Comments
 (0)