Commit 7ae7ce0b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Acked-by: default avatarManish Rangankar <Manish.Rangankar@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 332d84f7

drivers/scsi/qedi/qedi_main.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -806,11 +806,11 @@ static int qedi_set_iscsi_pf_param(struct qedi_ctx *qedi) 
	memset(&qedi->pf_params.iscsi_pf_params, 0,

	memset(&qedi->pf_params.iscsi_pf_params, 0,

	       sizeof(qedi->pf_params.iscsi_pf_params));

	       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->num_queues * sizeof(struct qedi_glbl_q_params),

			&qedi->hw_p_cpuq);

			&qedi->hw_p_cpuq, GFP_KERNEL);

	if (!qedi->p_cpuq) {

	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;

		rval = -1;

		goto err_alloc_mem;

		goto err_alloc_mem;

	}

	}
@@ -871,7 +871,7 @@ static void qedi_free_iscsi_pf_param(struct qedi_ctx *qedi) 




	if (qedi->p_cpuq) {

	if (qedi->p_cpuq) {

		size = qedi->num_queues * sizeof(struct qedi_glbl_q_params);

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

				    qedi->hw_p_cpuq);

	}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE