Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit decab9a6 authored by Romain Perier's avatar Romain Perier Committed by Martin K. Petersen
Browse files

scsi: csiostor: Replace PCI pool old API 



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

Signed-off-by: default avatarRomain Perier <romain.perier@collabora.com>
Reviewed-by: default avatarPeter Senna Tschudin <peter.senna@collabora.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent af007b02

drivers/scsi/csiostor/csio_hw.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/scsi/csiostor/csio_init.c

+6 −5
Original line number Diff line number Diff line
@@ -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);

drivers/scsi/csiostor/csio_scsi.c

+3 −3
Original line number Diff line number Diff line
@@ -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);