Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ae6725d authored by Xiang Chen's avatar Xiang Chen Committed by Martin K. Petersen
Browse files

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: default avatarXiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b2035d81

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+1 −15
Original line number Diff line number Diff line
@@ -988,20 +988,6 @@ static int prep_smp_v3_hw(struct hisi_hba *hisi_hba, 
	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,

			  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);



	/* 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);

		dw2 |= hdr_tag << CMD_HDR_NCQ_TAG_OFF;

	}