Commit 4dc051eb authored by John Garry's avatar John Garry Committed by Martin K. Petersen
Browse files

scsi: libsas: Delete sas_ssp_task.task_prio 



Since libsas was introduced in commit 2908d778 ("[SCSI] aic94xx: new
driver"), sas_ssp_task.task_prio is never set, so delete it and any
references which depend on it being set (all of them).

Signed-off-by: default avatarJohn Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20230815115156.343535-8-john.g.garry@oracle.com


Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ebf26e93

drivers/scsi/aic94xx/aic94xx_task.c

+0 −1
Original line number Diff line number Diff line
@@ -485,7 +485,6 @@ static int asd_build_ssp_ascb(struct asd_ascb *ascb, struct sas_task *task, 
	scb->ssp_task.ssp_frame.tptt = cpu_to_be16(0xFFFF);



	memcpy(scb->ssp_task.ssp_cmd.lun, task->ssp_task.LUN, 8);

	scb->ssp_task.ssp_cmd.efb_prio_attr |= (task->ssp_task.task_prio << 3);

	scb->ssp_task.ssp_cmd.efb_prio_attr |= (task->ssp_task.task_attr & 7);

	memcpy(scb->ssp_task.ssp_cmd.cdb, task->ssp_task.cmd->cmnd,

	       task->ssp_task.cmd->cmd_len);

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+1 −2
Original line number Diff line number Diff line
@@ -1022,8 +1022,7 @@ static void prep_ssp_v1_hw(struct hisi_hba *hisi_hba, 


	memcpy(buf_cmd, &task->ssp_task.LUN, 8);

	if (!tmf) {

		buf_cmd[9] = task->ssp_task.task_attr |

				(task->ssp_task.task_prio << 3);

		buf_cmd[9] = task->ssp_task.task_attr;

		memcpy(buf_cmd + 12, task->ssp_task.cmd->cmnd,

				task->ssp_task.cmd->cmd_len);

	} else {

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+1 −2
Original line number Diff line number Diff line
@@ -1798,8 +1798,7 @@ static void prep_ssp_v2_hw(struct hisi_hba *hisi_hba, 


	memcpy(buf_cmd, &task->ssp_task.LUN, 8);

	if (!tmf) {

		buf_cmd[9] = task->ssp_task.task_attr |

				(task->ssp_task.task_prio << 3);

		buf_cmd[9] = task->ssp_task.task_attr;

		memcpy(buf_cmd + 12, task->ssp_task.cmd->cmnd,

				task->ssp_task.cmd->cmd_len);

	} else {

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1326,7 +1326,7 @@ static void prep_ssp_v3_hw(struct hisi_hba *hisi_hba, 


	memcpy(buf_cmd, &task->ssp_task.LUN, 8);

	if (!tmf) {

		buf_cmd[9] = ssp_task->task_attr | (ssp_task->task_prio << 3);

		buf_cmd[9] = ssp_task->task_attr;

		memcpy(buf_cmd + 12, scsi_cmnd->cmnd, scsi_cmnd->cmd_len);

	} else {

		buf_cmd[10] = tmf->tmf;

drivers/scsi/isci/request.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static void sci_io_request_build_ssp_command_iu(struct isci_request *ireq) 
	cmd_iu->_r_a = 0;

	cmd_iu->_r_b = 0;

	cmd_iu->en_fburst = 0; /* unsupported */

	cmd_iu->task_prio = task->ssp_task.task_prio;

	cmd_iu->task_prio = 0;

	cmd_iu->task_attr = task->ssp_task.task_attr;

	cmd_iu->_r_c = 0;