From: Romain Perier <romain.perier@collabora.com>
To: Dan Williams <dan.j.williams@intel.com>,
Doug Ledford <dledford@redhat.com>,
Sean Hefty <sean.hefty@intel.com>,
Hal Rosenstock <hal.rosenstock@gmail.com>,
jeffrey.t.kirsher@intel.com,
"David S. Miller" <davem@davemloft.net>,
stas.yakovlev@gmail.com,
"James E.J. Bottomley" <jejb@linux.vnet.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Felipe Balbi <balbi@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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>
Subject: [PATCH v4 02/19] dmaengine: pch_dma: Replace PCI pool old API
Date: Wed, 1 Mar 2017 16:55:04 +0100 [thread overview]
Message-ID: <20170301155521.30281-3-romain.perier@collabora.com> (raw)
In-Reply-To: <20170301155521.30281-1-romain.perier@collabora.com>
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/dma/pch_dma.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index f9028e9..afd8f27 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -123,7 +123,7 @@ struct pch_dma_chan {
struct pch_dma {
struct dma_device dma;
void __iomem *membase;
- struct pci_pool *pool;
+ struct dma_pool *pool;
struct pch_dma_regs regs;
struct pch_dma_desc_regs ch_regs[MAX_CHAN_NR];
struct pch_dma_chan channels[MAX_CHAN_NR];
@@ -437,7 +437,7 @@ static struct pch_dma_desc *pdc_alloc_desc(struct dma_chan *chan, gfp_t flags)
struct pch_dma *pd = to_pd(chan->device);
dma_addr_t addr;
- desc = pci_pool_zalloc(pd->pool, flags, &addr);
+ desc = dma_pool_zalloc(pd->pool, flags, &addr);
if (desc) {
INIT_LIST_HEAD(&desc->tx_list);
dma_async_tx_descriptor_init(&desc->txd, chan);
@@ -549,7 +549,7 @@ static void pd_free_chan_resources(struct dma_chan *chan)
spin_unlock_irq(&pd_chan->lock);
list_for_each_entry_safe(desc, _d, &tmp_list, desc_node)
- pci_pool_free(pd->pool, desc, desc->txd.phys);
+ dma_pool_free(pd->pool, desc, desc->txd.phys);
pdc_enable_irq(chan, 0);
}
@@ -880,7 +880,7 @@ static int pch_dma_probe(struct pci_dev *pdev,
goto err_iounmap;
}
- pd->pool = pci_pool_create("pch_dma_desc_pool", pdev,
+ pd->pool = dma_pool_create("pch_dma_desc_pool", &pdev->dev,
sizeof(struct pch_dma_desc), 4, 0);
if (!pd->pool) {
dev_err(&pdev->dev, "Failed to alloc DMA descriptors\n");
@@ -931,7 +931,7 @@ static int pch_dma_probe(struct pci_dev *pdev,
return 0;
err_free_pool:
- pci_pool_destroy(pd->pool);
+ dma_pool_destroy(pd->pool);
err_free_irq:
free_irq(pdev->irq, pd);
err_iounmap:
@@ -963,7 +963,7 @@ static void pch_dma_remove(struct pci_dev *pdev)
tasklet_kill(&pd_chan->tasklet);
}
- pci_pool_destroy(pd->pool);
+ dma_pool_destroy(pd->pool);
pci_iounmap(pdev, pd->membase);
pci_release_regions(pdev);
pci_disable_device(pdev);
--
2.9.3
next prev parent reply other threads:[~2017-03-01 15:56 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-01 15:55 [PATCH v4 00/19] Replace PCI pool by DMA pool API Romain Perier
2017-03-01 15:55 ` [PATCH v4 01/19] block: DAC960: Replace PCI pool old API Romain Perier
2017-03-01 15:55 ` Romain Perier [this message]
2017-03-01 15:55 ` [PATCH v4 03/19] IB/mthca: " Romain Perier
2017-03-01 15:55 ` [PATCH v4 04/19] net: e100: " Romain Perier
2017-03-01 15:55 ` [PATCH v4 05/19] mlx4: " Romain Perier
2017-03-01 15:55 ` [PATCH v4 06/19] mlx5: " Romain Perier
2017-03-01 15:55 ` [PATCH v4 07/19] wireless: ipw2200: " Romain Perier
2017-03-01 15:55 ` [PATCH v4 08/19] scsi: be2iscsi: " Romain Perier
2017-03-03 9:30 ` Sergei Shtylyov
2017-03-01 15:55 ` [PATCH v4 09/19] scsi: csiostor: " Romain Perier
2017-03-03 9:27 ` Sergei Shtylyov
2017-03-01 15:55 ` [PATCH v4 10/19] scsi: lpfc: " Romain Perier
2017-03-01 15:55 ` [PATCH v4 11/19] scsi: megaraid: " Romain Perier
2017-03-02 6:55 ` Sumit Saxena
2017-03-01 15:55 ` [PATCH v4 12/19] scsi: mpt3sas: " Romain Perier
2017-03-01 15:55 ` [PATCH v4 13/19] scsi: mvsas: " Romain Perier
2017-03-01 15:55 ` [PATCH v4 14/19] scsi: pmcraid: " Romain Perier
2017-03-01 15:55 ` [PATCH v4 15/19] usb: gadget: amd5536udc: " Romain Perier
2017-03-01 15:55 ` [PATCH v4 16/19] usb: gadget: net2280: " Romain Perier
2017-03-01 15:55 ` [PATCH v4 17/19] usb: gadget: pch_udc: " Romain Perier
2017-03-01 15:55 ` [PATCH v4 18/19] usb: host: Remove remaining pci_pool in comments Romain Perier
2017-03-01 15:55 ` [PATCH v4 19/19] PCI: Remove PCI pool macro functions Romain Perier
2017-03-01 19:29 ` [PATCH v4 00/19] Replace PCI pool by DMA pool API Joe Perches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170301155521.30281-3-romain.perier@collabora.com \
--to=romain.perier@collabora.com \
--cc=balbi@kernel.org \
--cc=dan.j.williams@intel.com \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=hal.rosenstock@gmail.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=netdev@vger.kernel.org \
--cc=peter.senna@collabora.co.uk \
--cc=sean.hefty@intel.com \
--cc=stas.yakovlev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).