Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1590459

[PATCH v4 09/19] scsi: csiostor: Replace PCI pool old API

Path csiph.com!eternal-september.org!feeder.eternal-september.org!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod
From Romain Perier <romain.perier@collabora.com>
Newsgroups linux.kernel
Subject [PATCH v4 09/19] scsi: csiostor: Replace PCI pool old API
Date Wed, 01 Mar 2017 17:00:04 +0100
Message-ID <tgePy-5b2-71@gated-at.bofh.it> (permalink)
References <tgePv-5b2-1@gated-at.bofh.it>
X-Mailer git-send-email 2.9.3
Sender robomod@news.nic.it
List-ID <linux-kernel.vger.kernel.org>
X-Mailing-List linux-kernel@vger.kernel.org
Approved robomod@news.nic.it
Lines 87
Organization linux.* mail to news gateway
X-Original-Cc linux-rdma@vger.kernel.org, netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Romain Perier <romain.perier@collabora.com>, Peter Senna Tschudin <peter.senna@collabora.co.uk>
X-Original-Date Wed, 1 Mar 2017 16:55:11 +0100
X-Original-Message-ID <20170301155521.30281-10-romain.perier@collabora.com>
X-Original-References <20170301155521.30281-1-romain.perier@collabora.com>
X-Original-Sender linux-kernel-owner@vger.kernel.org
Xref csiph.com linux.kernel:1590459

Show key headers only | View raw

The PCI pool API is deprecated. This commits replaces the PCI pool old
API by the appropriated function with the DMA pool API. It also updates
the name of some variables and the content of comments, accordingly.

Signed-off-by: Romain Perier <romain.perier@collabora.com>
Reviewed-by: Peter Senna Tschudin <peter.senna@collabora.com>
---
 drivers/scsi/csiostor/csio_hw.h   |  2 +-
 drivers/scsi/csiostor/csio_init.c | 11 ++++++-----
 drivers/scsi/csiostor/csio_scsi.c |  6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/scsi/csiostor/csio_hw.h b/drivers/scsi/csiostor/csio_hw.h
index 029bef8..55b04fc 100644
--- a/drivers/scsi/csiostor/csio_hw.h
+++ b/drivers/scsi/csiostor/csio_hw.h
@@ -465,7 +465,7 @@ struct csio_hw {
 	struct csio_pport	pport[CSIO_MAX_PPORTS];	/* Ports (XGMACs) */
 	struct csio_hw_params	params;			/* Hw parameters */
 
-	struct pci_pool		*scsi_pci_pool;		/* PCI pool for SCSI */
+	struct dma_pool		*scsi_dma_pool;		/* DMA pool for SCSI */
 	mempool_t		*mb_mempool;		/* Mailbox memory pool*/
 	mempool_t		*rnode_mempool;		/* rnode memory pool */
 
diff --git a/drivers/scsi/csiostor/csio_init.c b/drivers/scsi/csiostor/csio_init.c
index dbe416f..292964c 100644
--- a/drivers/scsi/csiostor/csio_init.c
+++ b/drivers/scsi/csiostor/csio_init.c
@@ -485,9 +485,10 @@ csio_resource_alloc(struct csio_hw *hw)
 	if (!hw->rnode_mempool)
 		goto err_free_mb_mempool;
 
-	hw->scsi_pci_pool = pci_pool_create("csio_scsi_pci_pool", hw->pdev,
-					    CSIO_SCSI_RSP_LEN, 8, 0);
-	if (!hw->scsi_pci_pool)
+	hw->scsi_dma_pool = dma_pool_create("csio_scsi_dma_pool",
+					    &hw->pdev->dev, CSIO_SCSI_RSP_LEN,
+					    8, 0);
+	if (!hw->scsi_dma_pool)
 		goto err_free_rn_pool;
 
 	return 0;
@@ -505,8 +506,8 @@ csio_resource_alloc(struct csio_hw *hw)
 static void
 csio_resource_free(struct csio_hw *hw)
 {
-	pci_pool_destroy(hw->scsi_pci_pool);
-	hw->scsi_pci_pool = NULL;
+	dma_pool_destroy(hw->scsi_dma_pool);
+	hw->scsi_dma_pool = NULL;
 	mempool_destroy(hw->rnode_mempool);
 	hw->rnode_mempool = NULL;
 	mempool_destroy(hw->mb_mempool);
diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c
index a1ff75f..dab0d3f 100644
--- a/drivers/scsi/csiostor/csio_scsi.c
+++ b/drivers/scsi/csiostor/csio_scsi.c
@@ -2445,7 +2445,7 @@ csio_scsim_init(struct csio_scsim *scm, struct csio_hw *hw)
 
 		/* Allocate Dma buffers for Response Payload */
 		dma_buf = &ioreq->dma_buf;
-		dma_buf->vaddr = pci_pool_alloc(hw->scsi_pci_pool, GFP_KERNEL,
+		dma_buf->vaddr = dma_pool_alloc(hw->scsi_dma_pool, GFP_KERNEL,
 						&dma_buf->paddr);
 		if (!dma_buf->vaddr) {
 			csio_err(hw,
@@ -2485,7 +2485,7 @@ csio_scsim_init(struct csio_scsim *scm, struct csio_hw *hw)
 		ioreq = (struct csio_ioreq *)tmp;
 
 		dma_buf = &ioreq->dma_buf;
-		pci_pool_free(hw->scsi_pci_pool, dma_buf->vaddr,
+		dma_pool_free(hw->scsi_dma_pool, dma_buf->vaddr,
 			      dma_buf->paddr);
 
 		kfree(ioreq);
@@ -2516,7 +2516,7 @@ csio_scsim_exit(struct csio_scsim *scm)
 		ioreq = (struct csio_ioreq *)tmp;
 
 		dma_buf = &ioreq->dma_buf;
-		pci_pool_free(scm->hw->scsi_pci_pool, dma_buf->vaddr,
+		dma_pool_free(scm->hw->scsi_dma_pool, dma_buf->vaddr,
 			      dma_buf->paddr);
 
 		kfree(ioreq);
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v4 00/19] Replace PCI pool by DMA pool API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:00 +0100
  [PATCH v4 03/19] IB/mthca: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:00 +0100
  [PATCH v4 08/19] scsi: be2iscsi: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:00 +0100
    Re: [PATCH v4 08/19] scsi: be2iscsi: Replace PCI pool old API Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2017-03-03 14:30 +0100
  [PATCH v4 02/19] dmaengine: pch_dma: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:00 +0100
  [PATCH v4 01/19] block: DAC960: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:00 +0100
  [PATCH v4 17/19] usb: gadget: pch_udc: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:00 +0100
  [PATCH v4 09/19] scsi: csiostor: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:00 +0100
    Re: [PATCH v4 09/19] scsi: csiostor: Replace PCI pool old API Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2017-03-03 11:50 +0100
  [PATCH v4 15/19] usb: gadget: amd5536udc: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:20 +0100
  [PATCH v4 04/19] net: e100: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:20 +0100
  [PATCH v4 19/19] PCI: Remove PCI pool macro functions Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:20 +0100
  [PATCH v4 14/19] scsi: pmcraid: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:20 +0100
  [PATCH v4 06/19] mlx5: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:20 +0100
  [PATCH v4 05/19] mlx4: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:20 +0100
  [PATCH v4 18/19] usb: host: Remove remaining pci_pool in comments Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:20 +0100
  [PATCH v4 07/19] wireless: ipw2200: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:20 +0100
  [PATCH v4 10/19] scsi: lpfc: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:30 +0100
  [PATCH v4 11/19] scsi: megaraid: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:30 +0100
    RE: [PATCH v4 11/19] scsi: megaraid: Replace PCI pool old API Sumit Saxena <sumit.saxena@broadcom.com> - 2017-03-02 08:10 +0100
  [PATCH v4 16/19] usb: gadget: net2280: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:30 +0100
  [PATCH v4 12/19] scsi: mpt3sas: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:30 +0100
  [PATCH v4 13/19] scsi: mvsas: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-01 17:30 +0100
  Re: [PATCH v4 00/19] Replace PCI pool by DMA pool API Joe Perches <joe@perches.com> - 2017-03-01 20:40 +0100

csiph-web