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>

diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c
index aa96bccb5a9645d1b43f6fae77543a56dd89f58b..c94e18545f85d11a19949633e6c6ea90c3d6425b 100644 (file)
--- 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)
        memset(&qedi->pf_params.iscsi_pf_params, 0,
               sizeof(qedi->pf_params.iscsi_pf_params));
 
-       qedi->p_cpuq = pci_alloc_consistent(qedi->pdev,
+       qedi->p_cpuq = dma_alloc_coherent(&qedi->pdev->dev,
                        qedi->num_queues * sizeof(struct qedi_glbl_q_params),
-                       &qedi->hw_p_cpuq);
+                       &qedi->hw_p_cpuq, GFP_KERNEL);
        if (!qedi->p_cpuq) {
-               QEDI_ERR(&qedi->dbg_ctx, "pci_alloc_consistent fail\n");
+               QEDI_ERR(&qedi->dbg_ctx, "dma_alloc_coherent fail\n");
                rval = -1;
                goto err_alloc_mem;
        }
@@ -871,7 +871,7 @@ static void qedi_free_iscsi_pf_param(struct qedi_ctx *qedi)
 
        if (qedi->p_cpuq) {
                size = qedi->num_queues * sizeof(struct qedi_glbl_q_params);
-               pci_free_consistent(qedi->pdev, size, qedi->p_cpuq,
+               dma_free_coherent(&qedi->pdev->dev, size, qedi->p_cpuq,
                                    qedi->hw_p_cpuq);
        }