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


Groups > linux.kernel > #1590447

[PATCH v4 08/19] scsi: be2iscsi: Replace PCI pool old API

From Romain Perier <romain.perier@collabora.com>
Newsgroups linux.kernel
Subject [PATCH v4 08/19] scsi: be2iscsi: Replace PCI pool old API
Date 2017-03-01 17:00 +0100
Message-ID <tgePx-5b2-41@gated-at.bofh.it> (permalink)
References <tgePv-5b2-1@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | 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.

Signed-off-by: Romain Perier <romain.perier@collabora.com>
Acked-by: Peter Senna Tschudin <peter.senna@collabora.com>
Tested-by: Peter Senna Tschudin <peter.senna@collabora.com>
---
 drivers/scsi/be2iscsi/be_iscsi.c | 6 +++---
 drivers/scsi/be2iscsi/be_main.c  | 6 +++---
 drivers/scsi/be2iscsi/be_main.h  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c
index a484457..d76ef77 100644
--- a/drivers/scsi/be2iscsi/be_iscsi.c
+++ b/drivers/scsi/be2iscsi/be_iscsi.c
@@ -87,8 +87,8 @@ struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep,
 		return NULL;
 	sess = cls_session->dd_data;
 	beiscsi_sess = sess->dd_data;
-	beiscsi_sess->bhs_pool =  pci_pool_create("beiscsi_bhs_pool",
-						   phba->pcidev,
+	beiscsi_sess->bhs_pool =  dma_pool_create("beiscsi_bhs_pool",
+						   &phba->pcidev->dev,
 						   sizeof(struct be_cmd_bhs),
 						   64, 0);
 	if (!beiscsi_sess->bhs_pool)
@@ -113,7 +113,7 @@ void beiscsi_session_destroy(struct iscsi_cls_session *cls_session)
 	struct beiscsi_session *beiscsi_sess = sess->dd_data;
 
 	printk(KERN_INFO "In beiscsi_session_destroy\n");
-	pci_pool_destroy(beiscsi_sess->bhs_pool);
+	dma_pool_destroy(beiscsi_sess->bhs_pool);
 	iscsi_session_teardown(cls_session);
 }
 
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 32b2713..dd43480 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -4307,7 +4307,7 @@ static void beiscsi_cleanup_task(struct iscsi_task *task)
 	pwrb_context = &phwi_ctrlr->wrb_context[cri_index];
 
 	if (io_task->cmd_bhs) {
-		pci_pool_free(beiscsi_sess->bhs_pool, io_task->cmd_bhs,
+		dma_pool_free(beiscsi_sess->bhs_pool, io_task->cmd_bhs,
 			      io_task->bhs_pa.u.a64.address);
 		io_task->cmd_bhs = NULL;
 		task->hdr = NULL;
@@ -4424,7 +4424,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)
 	struct beiscsi_session *beiscsi_sess = beiscsi_conn->beiscsi_sess;
 	dma_addr_t paddr;
 
-	io_task->cmd_bhs = pci_pool_alloc(beiscsi_sess->bhs_pool,
+	io_task->cmd_bhs = dma_pool_alloc(beiscsi_sess->bhs_pool,
 					  GFP_ATOMIC, &paddr);
 	if (!io_task->cmd_bhs)
 		return -ENOMEM;
@@ -4551,7 +4551,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)
 	if (io_task->pwrb_handle)
 		free_wrb_handle(phba, pwrb_context, io_task->pwrb_handle);
 	io_task->pwrb_handle = NULL;
-	pci_pool_free(beiscsi_sess->bhs_pool, io_task->cmd_bhs,
+	dma_pool_free(beiscsi_sess->bhs_pool, io_task->cmd_bhs,
 		      io_task->bhs_pa.u.a64.address);
 	io_task->cmd_bhs = NULL;
 	return -ENOMEM;
diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h
index 2188579..cf58d31 100644
--- a/drivers/scsi/be2iscsi/be_main.h
+++ b/drivers/scsi/be2iscsi/be_main.h
@@ -446,7 +446,7 @@ struct beiscsi_hba {
 	 test_bit(BEISCSI_HBA_ONLINE, &phba->state))
 
 struct beiscsi_session {
-	struct pci_pool *bhs_pool;
+	struct dma_pool *bhs_pool;
 };
 
 /**
-- 
2.9.3

Back to linux.kernel | Previous | NextPrevious 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