{"id":810454,"url":"http://patchwork.ozlabs.org/api/patches/810454/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170906090857.14846-3-romain.perier@collabora.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170906090857.14846-3-romain.perier@collabora.com>","list_archive_url":null,"date":"2017-09-06T09:08:54","name":"[v13,2/5] dmaengine: pch_dma: Replace PCI pool old API","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"0c4262451a080bc62e90357353ac010aded46613","submitter":{"id":70720,"url":"http://patchwork.ozlabs.org/api/people/70720/?format=json","name":"Romain Perier","email":"romain.perier@collabora.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170906090857.14846-3-romain.perier@collabora.com/mbox/","series":[{"id":1729,"url":"http://patchwork.ozlabs.org/api/series/1729/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=1729","date":"2017-09-06T09:08:56","name":"Replace PCI pool by DMA pool API","version":13,"mbox":"http://patchwork.ozlabs.org/series/1729/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810454/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810454/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xnHqL03kdz9s7c\n\tfor ;\n\tWed, 6 Sep 2017 19:10:22 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752517AbdIFJJd (ORCPT );\n\tWed, 6 Sep 2017 05:09:33 -0400","from bhuna.collabora.co.uk ([46.235.227.227]:50676 \"EHLO\n\tbhuna.collabora.co.uk\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752021AbdIFJJ2 (ORCPT\n\t); Wed, 6 Sep 2017 05:09:28 -0400","from [127.0.0.1] (localhost [127.0.0.1])\n\t(Authenticated sender: rperier) with ESMTPSA id 4FD4826C99D"],"From":"Romain Perier ","To":"Dan Williams ,\n\tDoug Ledford , Sean Hefty ,\n\tHal Rosenstock , jeffrey.t.kirsher@intel.com,\n\t\"David S. Miller\" , stas.yakovlev@gmail.com,\n\tAviad Krawczyk ","Cc":"linux-rdma@vger.kernel.org, netdev@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org,\n\tGreg Kroah-Hartman ,\n\tRomain Perier ","Subject":"[PATCH v13 2/5] dmaengine: pch_dma: Replace PCI pool old API","Date":"Wed, 6 Sep 2017 11:08:54 +0200","Message-Id":"<20170906090857.14846-3-romain.perier@collabora.com>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170906090857.14846-1-romain.perier@collabora.com>","References":"<20170906090857.14846-1-romain.perier@collabora.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"The PCI pool API is deprecated. This commit replaces the PCI pool old\nAPI by the appropriate function with the DMA pool API.\n\nSigned-off-by: Romain Perier \nAcked-by: Peter Senna Tschudin \nTested-by: Peter Senna Tschudin \n---\n drivers/dma/pch_dma.c | 12 ++++++------\n 1 file changed, 6 insertions(+), 6 deletions(-)","diff":"diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c\nindex f9028e9d0dfc..afd8f27bda96 100644\n--- a/drivers/dma/pch_dma.c\n+++ b/drivers/dma/pch_dma.c\n@@ -123,7 +123,7 @@ struct pch_dma_chan {\n struct pch_dma {\n \tstruct dma_device\tdma;\n \tvoid __iomem *membase;\n-\tstruct pci_pool\t\t*pool;\n+\tstruct dma_pool\t\t*pool;\n \tstruct pch_dma_regs\tregs;\n \tstruct pch_dma_desc_regs ch_regs[MAX_CHAN_NR];\n \tstruct pch_dma_chan\tchannels[MAX_CHAN_NR];\n@@ -437,7 +437,7 @@ static struct pch_dma_desc *pdc_alloc_desc(struct dma_chan *chan, gfp_t flags)\n \tstruct pch_dma *pd = to_pd(chan->device);\n \tdma_addr_t addr;\n \n-\tdesc = pci_pool_zalloc(pd->pool, flags, &addr);\n+\tdesc = dma_pool_zalloc(pd->pool, flags, &addr);\n \tif (desc) {\n \t\tINIT_LIST_HEAD(&desc->tx_list);\n \t\tdma_async_tx_descriptor_init(&desc->txd, chan);\n@@ -549,7 +549,7 @@ static void pd_free_chan_resources(struct dma_chan *chan)\n \tspin_unlock_irq(&pd_chan->lock);\n \n \tlist_for_each_entry_safe(desc, _d, &tmp_list, desc_node)\n-\t\tpci_pool_free(pd->pool, desc, desc->txd.phys);\n+\t\tdma_pool_free(pd->pool, desc, desc->txd.phys);\n \n \tpdc_enable_irq(chan, 0);\n }\n@@ -880,7 +880,7 @@ static int pch_dma_probe(struct pci_dev *pdev,\n \t\tgoto err_iounmap;\n \t}\n \n-\tpd->pool = pci_pool_create(\"pch_dma_desc_pool\", pdev,\n+\tpd->pool = dma_pool_create(\"pch_dma_desc_pool\", &pdev->dev,\n \t\t\t\t sizeof(struct pch_dma_desc), 4, 0);\n \tif (!pd->pool) {\n \t\tdev_err(&pdev->dev, \"Failed to alloc DMA descriptors\\n\");\n@@ -931,7 +931,7 @@ static int pch_dma_probe(struct pci_dev *pdev,\n \treturn 0;\n \n err_free_pool:\n-\tpci_pool_destroy(pd->pool);\n+\tdma_pool_destroy(pd->pool);\n err_free_irq:\n \tfree_irq(pdev->irq, pd);\n err_iounmap:\n@@ -963,7 +963,7 @@ static void pch_dma_remove(struct pci_dev *pdev)\n \t\t\ttasklet_kill(&pd_chan->tasklet);\n \t\t}\n \n-\t\tpci_pool_destroy(pd->pool);\n+\t\tdma_pool_destroy(pd->pool);\n \t\tpci_iounmap(pdev, pd->membase);\n \t\tpci_release_regions(pdev);\n \t\tpci_disable_device(pdev);\n","prefixes":["v13","2/5"]}