summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qedi
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-10-10 14:06:13 -0400
committerMartin K. Petersen <martin.petersen@oracle.com>2018-10-17 21:58:53 -0400
commit7ae7ce0bbefff16d24d932f650b9bd9e8c08c0da (patch)
tree525dcf262a82db044833f4eab024b1bbd5c32337 /drivers/scsi/qedi
parent332d84f7f6378d6f595449f02c3552c22a77bd86 (diff)
scsi: qedi: fully convert to the generic DMA API
The driver is currently using an odd mix of legacy PCI DMA API and generic DMA API calls, switch it over to the generic API entirely. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Acked-by: Manish Rangankar <Manish.Rangankar@cavium.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/qedi')
-rw-r--r--drivers/scsi/qedi/qedi_main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c
index aa96bccb5a96..c94e18545f85 100644
--- a/drivers/scsi/qedi/qedi_main.c
+++ b/drivers/scsi/qedi/qedi_main.c
@@ -806,11 +806,11 @@ static int qedi_set_iscsi_pf_param(struct qedi_ctx *qedi)
806 memset(&qedi->pf_params.iscsi_pf_params, 0, 806 memset(&qedi->pf_params.iscsi_pf_params, 0,
807 sizeof(qedi->pf_params.iscsi_pf_params)); 807 sizeof(qedi->pf_params.iscsi_pf_params));
808 808
809 qedi->p_cpuq = pci_alloc_consistent(qedi->pdev, 809 qedi->p_cpuq = dma_alloc_coherent(&qedi->pdev->dev,
810 qedi->num_queues * sizeof(struct qedi_glbl_q_params), 810 qedi->num_queues * sizeof(struct qedi_glbl_q_params),
811 &qedi->hw_p_cpuq); 811 &qedi->hw_p_cpuq, GFP_KERNEL);
812 if (!qedi->p_cpuq) { 812 if (!qedi->p_cpuq) {
813 QEDI_ERR(&qedi->dbg_ctx, "pci_alloc_consistent fail\n"); 813 QEDI_ERR(&qedi->dbg_ctx, "dma_alloc_coherent fail\n");
814 rval = -1; 814 rval = -1;
815 goto err_alloc_mem; 815 goto err_alloc_mem;
816 } 816 }
@@ -871,7 +871,7 @@ static void qedi_free_iscsi_pf_param(struct qedi_ctx *qedi)
871 871
872 if (qedi->p_cpuq) { 872 if (qedi->p_cpuq) {
873 size = qedi->num_queues * sizeof(struct qedi_glbl_q_params); 873 size = qedi->num_queues * sizeof(struct qedi_glbl_q_params);
874 pci_free_consistent(qedi->pdev, size, qedi->p_cpuq, 874 dma_free_coherent(&qedi->pdev->dev, size, qedi->p_cpuq,
875 qedi->hw_p_cpuq); 875 qedi->hw_p_cpuq);
876 } 876 }
877 877