cross-tree: phase out dma_zalloc_coherent()
We already need to zero out memory for dma_alloc_coherent(), as such using dma_zalloc_coherent() is superflous. Phase it out. This change was generated with the following Coccinelle SmPL patch: @ replace_dma_zalloc_coherent @ expression dev, size, data, handle, flags; @@ -dma_zalloc_coherent(dev, size, handle, flags) +dma_alloc_coherent(dev, size, handle, flags) Suggested-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> [hch: re-ran the script on the latest tree] Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:

committed by
Christoph Hellwig

parent
3bd6e94bec
commit
750afb08ca
@@ -1050,16 +1050,17 @@ static int qedf_alloc_sq(struct qedf_ctx *qedf, struct qedf_rport *fcport)
|
||||
sizeof(void *);
|
||||
fcport->sq_pbl_size = fcport->sq_pbl_size + QEDF_PAGE_SIZE;
|
||||
|
||||
fcport->sq = dma_zalloc_coherent(&qedf->pdev->dev,
|
||||
fcport->sq_mem_size, &fcport->sq_dma, GFP_KERNEL);
|
||||
fcport->sq = dma_alloc_coherent(&qedf->pdev->dev, fcport->sq_mem_size,
|
||||
&fcport->sq_dma, GFP_KERNEL);
|
||||
if (!fcport->sq) {
|
||||
QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate send queue.\n");
|
||||
rval = 1;
|
||||
goto out;
|
||||
}
|
||||
|
||||
fcport->sq_pbl = dma_zalloc_coherent(&qedf->pdev->dev,
|
||||
fcport->sq_pbl_size, &fcport->sq_pbl_dma, GFP_KERNEL);
|
||||
fcport->sq_pbl = dma_alloc_coherent(&qedf->pdev->dev,
|
||||
fcport->sq_pbl_size,
|
||||
&fcport->sq_pbl_dma, GFP_KERNEL);
|
||||
if (!fcport->sq_pbl) {
|
||||
QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate send queue PBL.\n");
|
||||
rval = 1;
|
||||
@@ -2680,8 +2681,10 @@ static int qedf_alloc_bdq(struct qedf_ctx *qedf)
|
||||
}
|
||||
|
||||
/* Allocate list of PBL pages */
|
||||
qedf->bdq_pbl_list = dma_zalloc_coherent(&qedf->pdev->dev,
|
||||
QEDF_PAGE_SIZE, &qedf->bdq_pbl_list_dma, GFP_KERNEL);
|
||||
qedf->bdq_pbl_list = dma_alloc_coherent(&qedf->pdev->dev,
|
||||
QEDF_PAGE_SIZE,
|
||||
&qedf->bdq_pbl_list_dma,
|
||||
GFP_KERNEL);
|
||||
if (!qedf->bdq_pbl_list) {
|
||||
QEDF_ERR(&(qedf->dbg_ctx), "Could not allocate list of PBL pages.\n");
|
||||
return -ENOMEM;
|
||||
@@ -2770,9 +2773,10 @@ static int qedf_alloc_global_queues(struct qedf_ctx *qedf)
|
||||
ALIGN(qedf->global_queues[i]->cq_pbl_size, QEDF_PAGE_SIZE);
|
||||
|
||||
qedf->global_queues[i]->cq =
|
||||
dma_zalloc_coherent(&qedf->pdev->dev,
|
||||
qedf->global_queues[i]->cq_mem_size,
|
||||
&qedf->global_queues[i]->cq_dma, GFP_KERNEL);
|
||||
dma_alloc_coherent(&qedf->pdev->dev,
|
||||
qedf->global_queues[i]->cq_mem_size,
|
||||
&qedf->global_queues[i]->cq_dma,
|
||||
GFP_KERNEL);
|
||||
|
||||
if (!qedf->global_queues[i]->cq) {
|
||||
QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate cq.\n");
|
||||
@@ -2781,9 +2785,10 @@ static int qedf_alloc_global_queues(struct qedf_ctx *qedf)
|
||||
}
|
||||
|
||||
qedf->global_queues[i]->cq_pbl =
|
||||
dma_zalloc_coherent(&qedf->pdev->dev,
|
||||
qedf->global_queues[i]->cq_pbl_size,
|
||||
&qedf->global_queues[i]->cq_pbl_dma, GFP_KERNEL);
|
||||
dma_alloc_coherent(&qedf->pdev->dev,
|
||||
qedf->global_queues[i]->cq_pbl_size,
|
||||
&qedf->global_queues[i]->cq_pbl_dma,
|
||||
GFP_KERNEL);
|
||||
|
||||
if (!qedf->global_queues[i]->cq_pbl) {
|
||||
QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate cq PBL.\n");
|
||||
|
Reference in New Issue
Block a user