scsi: hisi_sas: delete get_ncq_tag_v3_hw()
We already relocated hisi_sas_get_ncq_tag() into common file main.c, so delete get_ncq_tag_v3_hw() and use hisi_sas_get_ncq_tag() instead. Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com> Signed-off-by: John Garry <john.garry@huawei.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
b2035d813f
commit
8ae6725dca
|
@ -988,20 +988,6 @@ err_out_req:
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int get_ncq_tag_v3_hw(struct sas_task *task, u32 *tag)
|
|
||||||
{
|
|
||||||
struct ata_queued_cmd *qc = task->uldd_task;
|
|
||||||
|
|
||||||
if (qc) {
|
|
||||||
if (qc->tf.command == ATA_CMD_FPDMA_WRITE ||
|
|
||||||
qc->tf.command == ATA_CMD_FPDMA_READ) {
|
|
||||||
*tag = qc->tag;
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int prep_ata_v3_hw(struct hisi_hba *hisi_hba,
|
static int prep_ata_v3_hw(struct hisi_hba *hisi_hba,
|
||||||
struct hisi_sas_slot *slot)
|
struct hisi_sas_slot *slot)
|
||||||
{
|
{
|
||||||
|
@ -1050,7 +1036,7 @@ static int prep_ata_v3_hw(struct hisi_hba *hisi_hba,
|
||||||
hdr->dw1 = cpu_to_le32(dw1);
|
hdr->dw1 = cpu_to_le32(dw1);
|
||||||
|
|
||||||
/* dw2 */
|
/* dw2 */
|
||||||
if (task->ata_task.use_ncq && get_ncq_tag_v3_hw(task, &hdr_tag)) {
|
if (task->ata_task.use_ncq && hisi_sas_get_ncq_tag(task, &hdr_tag)) {
|
||||||
task->ata_task.fis.sector_count |= (u8) (hdr_tag << 3);
|
task->ata_task.fis.sector_count |= (u8) (hdr_tag << 3);
|
||||||
dw2 |= hdr_tag << CMD_HDR_NCQ_TAG_OFF;
|
dw2 |= hdr_tag << CMD_HDR_NCQ_TAG_OFF;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue