scsi: libsas: Delete sas_ssp_task.task_prio

Since libsas was introduced in commit 2908d778ab3e ("[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 <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20230815115156.343535-8-john.g.garry@oracle.com
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Jason Yan <yanaijie@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
index 1ac4d3a..f67983e 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx_task.c
+++ b/drivers/scsi/aic94xx/aic94xx_task.c
@@ -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);

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index d4e3c3a..3c55557 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -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 {

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index 87d8e40..51b9762 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -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 {

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 6a0aed9..b979d99 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -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;

diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index 6370cdb..a7b3243 100644 (file)
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -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;
 

diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index 165f463..1444b1f 100644 (file)
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -663,8 +663,7 @@ static int mvs_task_prep_ssp(struct mvs_info *mvi,
        memcpy(buf_cmd, &task->ssp_task.LUN, 8);
 
        if (ssp_hdr->frame_type != SSP_TASK) {
-               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{

diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index 18070e0..35797b5 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -4053,7 +4053,6 @@ static int pm8001_chip_ssp_io_req(struct pm8001_hba_info *pm8001_ha,
        ssp_cmd.data_len = cpu_to_le32(task->total_xfer_len);
        ssp_cmd.device_id = cpu_to_le32(pm8001_dev->device_id);
        ssp_cmd.tag = cpu_to_le32(tag);
-       ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_prio << 3);
        ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_attr & 7);
        memcpy(ssp_cmd.ssp_iu.cdb, task->ssp_task.cmd->cmnd,
               task->ssp_task.cmd->cmd_len);

diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c
index ad5a73b..1c092ee 100644 (file)
--- a/drivers/scsi/pm8001/pm80xx_hwi.c
+++ b/drivers/scsi/pm8001/pm80xx_hwi.c
@@ -4316,7 +4316,6 @@ static int pm80xx_chip_ssp_io_req(struct pm8001_hba_info *pm8001_ha,
        ssp_cmd.data_len = cpu_to_le32(task->total_xfer_len);
        ssp_cmd.device_id = cpu_to_le32(pm8001_dev->device_id);
        ssp_cmd.tag = cpu_to_le32(tag);
-       ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_prio << 3);
        ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_attr & 7);
        memcpy(ssp_cmd.ssp_iu.cdb, task->ssp_task.cmd->cmnd,
                       task->ssp_task.cmd->cmd_len);

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index d77db53..5b2e693 100644 (file)
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -565,7 +565,6 @@ enum task_attribute {
 struct sas_ssp_task {
        u8     LUN[8];
        enum   task_attribute task_attr;
-       u8     task_prio;
        struct scsi_cmnd *cmd;
 };