diff options
| author | Luis Chamberlain <mcgrof@kernel.org> | 2019-01-04 03:23:09 -0500 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-01-08 07:58:37 -0500 |
| commit | 750afb08ca71310fcf0c4e2cb1565c63b8235b60 (patch) | |
| tree | 1dde3877eb4a1a0f0349786b66c3d9276ae94561 /drivers/scsi/qedf/qedf_main.c | |
| parent | 3bd6e94bec122a951d462c239b47954cf5f36e33 (diff) | |
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>
Diffstat (limited to 'drivers/scsi/qedf/qedf_main.c')
| -rw-r--r-- | drivers/scsi/qedf/qedf_main.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c index edcaf4b0cb0b..9bbc19fc190b 100644 --- a/drivers/scsi/qedf/qedf_main.c +++ b/drivers/scsi/qedf/qedf_main.c | |||
| @@ -1050,16 +1050,17 @@ static int qedf_alloc_sq(struct qedf_ctx *qedf, struct qedf_rport *fcport) | |||
| 1050 | sizeof(void *); | 1050 | sizeof(void *); |
| 1051 | fcport->sq_pbl_size = fcport->sq_pbl_size + QEDF_PAGE_SIZE; | 1051 | fcport->sq_pbl_size = fcport->sq_pbl_size + QEDF_PAGE_SIZE; |
| 1052 | 1052 | ||
| 1053 | fcport->sq = dma_zalloc_coherent(&qedf->pdev->dev, | 1053 | fcport->sq = dma_alloc_coherent(&qedf->pdev->dev, fcport->sq_mem_size, |
| 1054 | fcport->sq_mem_size, &fcport->sq_dma, GFP_KERNEL); | 1054 | &fcport->sq_dma, GFP_KERNEL); |
| 1055 | if (!fcport->sq) { | 1055 | if (!fcport->sq) { |
| 1056 | QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate send queue.\n"); | 1056 | QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate send queue.\n"); |
| 1057 | rval = 1; | 1057 | rval = 1; |
| 1058 | goto out; | 1058 | goto out; |
| 1059 | } | 1059 | } |
| 1060 | 1060 | ||
| 1061 | fcport->sq_pbl = dma_zalloc_coherent(&qedf->pdev->dev, | 1061 | fcport->sq_pbl = dma_alloc_coherent(&qedf->pdev->dev, |
| 1062 | fcport->sq_pbl_size, &fcport->sq_pbl_dma, GFP_KERNEL); | 1062 | fcport->sq_pbl_size, |
| 1063 | &fcport->sq_pbl_dma, GFP_KERNEL); | ||
| 1063 | if (!fcport->sq_pbl) { | 1064 | if (!fcport->sq_pbl) { |
| 1064 | QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate send queue PBL.\n"); | 1065 | QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate send queue PBL.\n"); |
| 1065 | rval = 1; | 1066 | rval = 1; |
| @@ -2680,8 +2681,10 @@ static int qedf_alloc_bdq(struct qedf_ctx *qedf) | |||
| 2680 | } | 2681 | } |
| 2681 | 2682 | ||
| 2682 | /* Allocate list of PBL pages */ | 2683 | /* Allocate list of PBL pages */ |
| 2683 | qedf->bdq_pbl_list = dma_zalloc_coherent(&qedf->pdev->dev, | 2684 | qedf->bdq_pbl_list = dma_alloc_coherent(&qedf->pdev->dev, |
| 2684 | QEDF_PAGE_SIZE, &qedf->bdq_pbl_list_dma, GFP_KERNEL); | 2685 | QEDF_PAGE_SIZE, |
| 2686 | &qedf->bdq_pbl_list_dma, | ||
| 2687 | GFP_KERNEL); | ||
| 2685 | if (!qedf->bdq_pbl_list) { | 2688 | if (!qedf->bdq_pbl_list) { |
| 2686 | QEDF_ERR(&(qedf->dbg_ctx), "Could not allocate list of PBL pages.\n"); | 2689 | QEDF_ERR(&(qedf->dbg_ctx), "Could not allocate list of PBL pages.\n"); |
| 2687 | return -ENOMEM; | 2690 | return -ENOMEM; |
| @@ -2770,9 +2773,10 @@ static int qedf_alloc_global_queues(struct qedf_ctx *qedf) | |||
| 2770 | ALIGN(qedf->global_queues[i]->cq_pbl_size, QEDF_PAGE_SIZE); | 2773 | ALIGN(qedf->global_queues[i]->cq_pbl_size, QEDF_PAGE_SIZE); |
| 2771 | 2774 | ||
| 2772 | qedf->global_queues[i]->cq = | 2775 | qedf->global_queues[i]->cq = |
| 2773 | dma_zalloc_coherent(&qedf->pdev->dev, | 2776 | dma_alloc_coherent(&qedf->pdev->dev, |
| 2774 | qedf->global_queues[i]->cq_mem_size, | 2777 | qedf->global_queues[i]->cq_mem_size, |
| 2775 | &qedf->global_queues[i]->cq_dma, GFP_KERNEL); | 2778 | &qedf->global_queues[i]->cq_dma, |
| 2779 | GFP_KERNEL); | ||
| 2776 | 2780 | ||
| 2777 | if (!qedf->global_queues[i]->cq) { | 2781 | if (!qedf->global_queues[i]->cq) { |
| 2778 | QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate cq.\n"); | 2782 | QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate cq.\n"); |
| @@ -2781,9 +2785,10 @@ static int qedf_alloc_global_queues(struct qedf_ctx *qedf) | |||
| 2781 | } | 2785 | } |
| 2782 | 2786 | ||
| 2783 | qedf->global_queues[i]->cq_pbl = | 2787 | qedf->global_queues[i]->cq_pbl = |
| 2784 | dma_zalloc_coherent(&qedf->pdev->dev, | 2788 | dma_alloc_coherent(&qedf->pdev->dev, |
| 2785 | qedf->global_queues[i]->cq_pbl_size, | 2789 | qedf->global_queues[i]->cq_pbl_size, |
| 2786 | &qedf->global_queues[i]->cq_pbl_dma, GFP_KERNEL); | 2790 | &qedf->global_queues[i]->cq_pbl_dma, |
| 2791 | GFP_KERNEL); | ||
| 2787 | 2792 | ||
| 2788 | if (!qedf->global_queues[i]->cq_pbl) { | 2793 | if (!qedf->global_queues[i]->cq_pbl) { |
| 2789 | QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate cq PBL.\n"); | 2794 | QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate cq PBL.\n"); |
