diff options
author | Xiang Chen <chenxiang66@hisilicon.com> | 2017-10-24 11:51:31 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2017-10-25 08:21:03 -0400 |
commit | 8ae6725dca51b0cc97ce85317d8da45d77f1e8bb (patch) | |
tree | 9df01d31b4b91d6e08e9b6c96decfc4eb7e9184b | |
parent | b2035d813fb97632ec40cf1ce90aa3a325bbd15d (diff) |
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>
-rw-r--r-- | drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index 2e5fa9717be8..d60501f1d1c1 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | |||
@@ -988,20 +988,6 @@ err_out_req: | |||
988 | return rc; | 988 | return rc; |
989 | } | 989 | } |
990 | 990 | ||
991 | static int get_ncq_tag_v3_hw(struct sas_task *task, u32 *tag) | ||
992 | { | ||
993 | struct ata_queued_cmd *qc = task->uldd_task; | ||
994 | |||
995 | if (qc) { | ||
996 | if (qc->tf.command == ATA_CMD_FPDMA_WRITE || | ||
997 | qc->tf.command == ATA_CMD_FPDMA_READ) { | ||
998 | *tag = qc->tag; | ||
999 | return 1; | ||
1000 | } | ||
1001 | } | ||
1002 | return 0; | ||
1003 | } | ||
1004 | |||
1005 | static int prep_ata_v3_hw(struct hisi_hba *hisi_hba, | 991 | static int prep_ata_v3_hw(struct hisi_hba *hisi_hba, |
1006 | struct hisi_sas_slot *slot) | 992 | struct hisi_sas_slot *slot) |
1007 | { | 993 | { |
@@ -1050,7 +1036,7 @@ static int prep_ata_v3_hw(struct hisi_hba *hisi_hba, | |||
1050 | hdr->dw1 = cpu_to_le32(dw1); | 1036 | hdr->dw1 = cpu_to_le32(dw1); |
1051 | 1037 | ||
1052 | /* dw2 */ | 1038 | /* dw2 */ |
1053 | if (task->ata_task.use_ncq && get_ncq_tag_v3_hw(task, &hdr_tag)) { | 1039 | if (task->ata_task.use_ncq && hisi_sas_get_ncq_tag(task, &hdr_tag)) { |
1054 | task->ata_task.fis.sector_count |= (u8) (hdr_tag << 3); | 1040 | task->ata_task.fis.sector_count |= (u8) (hdr_tag << 3); |
1055 | dw2 |= hdr_tag << CMD_HDR_NCQ_TAG_OFF; | 1041 | dw2 |= hdr_tag << CMD_HDR_NCQ_TAG_OFF; |
1056 | } | 1042 | } |