From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Senna Tschudin Subject: Re: [PATCH v3 13/20] scsi: mvsas: Replace PCI pool old API Date: Mon, 27 Feb 2017 12:18:33 +0100 Message-ID: <20170227111833.GG26544@collabora.com> References: <20170226192425.13098-1-romain.perier@collabora.com> <20170226192425.13098-14-romain.perier@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20170226192425.13098-14-romain.perier@collabora.com> Sender: linux-kernel-owner@vger.kernel.org To: Romain Perier Cc: Dan Williams , Doug Ledford , Sean Hefty , Hal Rosenstock , jeffrey.t.kirsher@intel.com, "David S. Miller" , stas.yakovlev@gmail.com, "James E.J. Bottomley" , "Martin K. Petersen" , Felipe Balbi , Greg Kroah-Hartman , linux-rdma@vger.kernel.org, netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Senna Tschudin List-Id: linux-rdma@vger.kernel.org On Sun, Feb 26, 2017 at 08:24:18PM +0100, Romain Perier wrote: > The PCI pool API is deprecated. This commits replaces the PCI pool old > API by the appropriated function with the DMA pool API. > Reviewed-by: Peter Senna Tschudin > Signed-off-by: Romain Perier > --- > drivers/scsi/mvsas/mv_init.c | 6 +++--- > drivers/scsi/mvsas/mv_sas.c | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c > index 8280046..41d2276 100644 > --- a/drivers/scsi/mvsas/mv_init.c > +++ b/drivers/scsi/mvsas/mv_init.c > @@ -125,8 +125,7 @@ static void mvs_free(struct mvs_info *mvi) > else > slot_nr = MVS_CHIP_SLOT_SZ; > > - if (mvi->dma_pool) > - pci_pool_destroy(mvi->dma_pool); > + dma_pool_destroy(mvi->dma_pool); > > if (mvi->tx) > dma_free_coherent(mvi->dev, > @@ -296,7 +295,8 @@ static int mvs_alloc(struct mvs_info *mvi, struct Scsi_Host *shost) > goto err_out; > > sprintf(pool_name, "%s%d", "mvs_dma_pool", mvi->id); > - mvi->dma_pool = pci_pool_create(pool_name, mvi->pdev, MVS_SLOT_BUF_SZ, 16, 0); > + mvi->dma_pool = dma_pool_create(pool_name, &mvi->pdev->dev, > + MVS_SLOT_BUF_SZ, 16, 0); > if (!mvi->dma_pool) { > printk(KERN_DEBUG "failed to create dma pool %s.\n", pool_name); > goto err_out; > diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c > index c7cc803..ee81d10 100644 > --- a/drivers/scsi/mvsas/mv_sas.c > +++ b/drivers/scsi/mvsas/mv_sas.c > @@ -790,7 +790,7 @@ static int mvs_task_prep(struct sas_task *task, struct mvs_info *mvi, int is_tmf > slot->n_elem = n_elem; > slot->slot_tag = tag; > > - slot->buf = pci_pool_alloc(mvi->dma_pool, GFP_ATOMIC, &slot->buf_dma); > + slot->buf = dma_pool_alloc(mvi->dma_pool, GFP_ATOMIC, &slot->buf_dma); > if (!slot->buf) { > rc = -ENOMEM; > goto err_out_tag; > @@ -840,7 +840,7 @@ static int mvs_task_prep(struct sas_task *task, struct mvs_info *mvi, int is_tmf > return rc; > > err_out_slot_buf: > - pci_pool_free(mvi->dma_pool, slot->buf, slot->buf_dma); > + dma_pool_free(mvi->dma_pool, slot->buf, slot->buf_dma); > err_out_tag: > mvs_tag_free(mvi, tag); > err_out: > @@ -918,7 +918,7 @@ static void mvs_slot_task_free(struct mvs_info *mvi, struct sas_task *task, > } > > if (slot->buf) { > - pci_pool_free(mvi->dma_pool, slot->buf, slot->buf_dma); > + dma_pool_free(mvi->dma_pool, slot->buf, slot->buf_dma); > slot->buf = NULL; > } > list_del_init(&slot->entry); > -- > 2.9.3 >