Skip to content

Commit 4dc051e

Browse files
johnpgarrymartinkpetersen
authored andcommitted
scsi: libsas: Delete sas_ssp_task.task_prio
Since libsas was introduced in commit 2908d77 ("[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: John Garry <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Damien Le Moal <[email protected]> Reviewed-by: Jason Yan <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent ebf26e9 commit 4dc051e

File tree

9 files changed

+5
-12
lines changed

9 files changed

+5
-12
lines changed

drivers/scsi/aic94xx/aic94xx_task.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,6 @@ static int asd_build_ssp_ascb(struct asd_ascb *ascb, struct sas_task *task,
485485
scb->ssp_task.ssp_frame.tptt = cpu_to_be16(0xFFFF);
486486

487487
memcpy(scb->ssp_task.ssp_cmd.lun, task->ssp_task.LUN, 8);
488-
scb->ssp_task.ssp_cmd.efb_prio_attr |= (task->ssp_task.task_prio << 3);
489488
scb->ssp_task.ssp_cmd.efb_prio_attr |= (task->ssp_task.task_attr & 7);
490489
memcpy(scb->ssp_task.ssp_cmd.cdb, task->ssp_task.cmd->cmnd,
491490
task->ssp_task.cmd->cmd_len);

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,8 +1022,7 @@ static void prep_ssp_v1_hw(struct hisi_hba *hisi_hba,
10221022

10231023
memcpy(buf_cmd, &task->ssp_task.LUN, 8);
10241024
if (!tmf) {
1025-
buf_cmd[9] = task->ssp_task.task_attr |
1026-
(task->ssp_task.task_prio << 3);
1025+
buf_cmd[9] = task->ssp_task.task_attr;
10271026
memcpy(buf_cmd + 12, task->ssp_task.cmd->cmnd,
10281027
task->ssp_task.cmd->cmd_len);
10291028
} else {

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1798,8 +1798,7 @@ static void prep_ssp_v2_hw(struct hisi_hba *hisi_hba,
17981798

17991799
memcpy(buf_cmd, &task->ssp_task.LUN, 8);
18001800
if (!tmf) {
1801-
buf_cmd[9] = task->ssp_task.task_attr |
1802-
(task->ssp_task.task_prio << 3);
1801+
buf_cmd[9] = task->ssp_task.task_attr;
18031802
memcpy(buf_cmd + 12, task->ssp_task.cmd->cmnd,
18041803
task->ssp_task.cmd->cmd_len);
18051804
} else {

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1326,7 +1326,7 @@ static void prep_ssp_v3_hw(struct hisi_hba *hisi_hba,
13261326

13271327
memcpy(buf_cmd, &task->ssp_task.LUN, 8);
13281328
if (!tmf) {
1329-
buf_cmd[9] = ssp_task->task_attr | (ssp_task->task_prio << 3);
1329+
buf_cmd[9] = ssp_task->task_attr;
13301330
memcpy(buf_cmd + 12, scsi_cmnd->cmnd, scsi_cmnd->cmd_len);
13311331
} else {
13321332
buf_cmd[10] = tmf->tmf;

drivers/scsi/isci/request.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ static void sci_io_request_build_ssp_command_iu(struct isci_request *ireq)
180180
cmd_iu->_r_a = 0;
181181
cmd_iu->_r_b = 0;
182182
cmd_iu->en_fburst = 0; /* unsupported */
183-
cmd_iu->task_prio = task->ssp_task.task_prio;
183+
cmd_iu->task_prio = 0;
184184
cmd_iu->task_attr = task->ssp_task.task_attr;
185185
cmd_iu->_r_c = 0;
186186

drivers/scsi/mvsas/mv_sas.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -663,8 +663,7 @@ static int mvs_task_prep_ssp(struct mvs_info *mvi,
663663
memcpy(buf_cmd, &task->ssp_task.LUN, 8);
664664

665665
if (ssp_hdr->frame_type != SSP_TASK) {
666-
buf_cmd[9] = task->ssp_task.task_attr |
667-
(task->ssp_task.task_prio << 3);
666+
buf_cmd[9] = task->ssp_task.task_attr;
668667
memcpy(buf_cmd + 12, task->ssp_task.cmd->cmnd,
669668
task->ssp_task.cmd->cmd_len);
670669
} else{

drivers/scsi/pm8001/pm8001_hwi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4053,7 +4053,6 @@ static int pm8001_chip_ssp_io_req(struct pm8001_hba_info *pm8001_ha,
40534053
ssp_cmd.data_len = cpu_to_le32(task->total_xfer_len);
40544054
ssp_cmd.device_id = cpu_to_le32(pm8001_dev->device_id);
40554055
ssp_cmd.tag = cpu_to_le32(tag);
4056-
ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_prio << 3);
40574056
ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_attr & 7);
40584057
memcpy(ssp_cmd.ssp_iu.cdb, task->ssp_task.cmd->cmnd,
40594058
task->ssp_task.cmd->cmd_len);

drivers/scsi/pm8001/pm80xx_hwi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4316,7 +4316,6 @@ static int pm80xx_chip_ssp_io_req(struct pm8001_hba_info *pm8001_ha,
43164316
ssp_cmd.data_len = cpu_to_le32(task->total_xfer_len);
43174317
ssp_cmd.device_id = cpu_to_le32(pm8001_dev->device_id);
43184318
ssp_cmd.tag = cpu_to_le32(tag);
4319-
ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_prio << 3);
43204319
ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_attr & 7);
43214320
memcpy(ssp_cmd.ssp_iu.cdb, task->ssp_task.cmd->cmnd,
43224321
task->ssp_task.cmd->cmd_len);

include/scsi/libsas.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,6 @@ enum task_attribute {
565565
struct sas_ssp_task {
566566
u8 LUN[8];
567567
enum task_attribute task_attr;
568-
u8 task_prio;
569568
struct scsi_cmnd *cmd;
570569
};
571570

0 commit comments

Comments
 (0)