{"id":810455,"url":"http://patchwork.ozlabs.org/api/patches/810455/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170906090857.14846-4-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-4-romain.perier@collabora.com>","list_archive_url":null,"date":"2017-09-06T09:08:55","name":"[v13,3/5] net: e100: Replace PCI pool old API","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"ab36fb4ce2432adf2d2a50cd9c67414ae8d64927","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-4-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/810455/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810455/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 3xnHqj66rjz9sNd\n\tfor ;\n\tWed, 6 Sep 2017 19:10:41 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752429AbdIFJK3 (ORCPT );\n\tWed, 6 Sep 2017 05:10:29 -0400","from bhuna.collabora.co.uk ([46.235.227.227]:50682 \"EHLO\n\tbhuna.collabora.co.uk\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752393AbdIFJJc (ORCPT\n\t); Wed, 6 Sep 2017 05:09:32 -0400","from [127.0.0.1] (localhost [127.0.0.1])\n\t(Authenticated sender: rperier) with ESMTPSA id DD4F0261431"],"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 3/5] net: e100: Replace PCI pool old API","Date":"Wed, 6 Sep 2017 11:08:55 +0200","Message-Id":"<20170906090857.14846-4-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 \nAcked-by: Jeff Kirsher \nTested-by: Peter Senna Tschudin \n---\n drivers/net/ethernet/intel/e100.c | 12 ++++++------\n 1 file changed, 6 insertions(+), 6 deletions(-)","diff":"diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c\nindex 4d10270ddf8f..d1470d30351c 100644\n--- a/drivers/net/ethernet/intel/e100.c\n+++ b/drivers/net/ethernet/intel/e100.c\n@@ -607,7 +607,7 @@ struct nic {\n \tstruct mem *mem;\n \tdma_addr_t dma_addr;\n \n-\tstruct pci_pool *cbs_pool;\n+\tstruct dma_pool *cbs_pool;\n \tdma_addr_t cbs_dma_addr;\n \tu8 adaptive_ifs;\n \tu8 tx_threshold;\n@@ -1892,7 +1892,7 @@ static void e100_clean_cbs(struct nic *nic)\n \t\t\tnic->cb_to_clean = nic->cb_to_clean->next;\n \t\t\tnic->cbs_avail++;\n \t\t}\n-\t\tpci_pool_free(nic->cbs_pool, nic->cbs, nic->cbs_dma_addr);\n+\t\tdma_pool_free(nic->cbs_pool, nic->cbs, nic->cbs_dma_addr);\n \t\tnic->cbs = NULL;\n \t\tnic->cbs_avail = 0;\n \t}\n@@ -1910,7 +1910,7 @@ static int e100_alloc_cbs(struct nic *nic)\n \tnic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = NULL;\n \tnic->cbs_avail = 0;\n \n-\tnic->cbs = pci_pool_alloc(nic->cbs_pool, GFP_KERNEL,\n+\tnic->cbs = dma_pool_alloc(nic->cbs_pool, GFP_KERNEL,\n \t\t\t\t &nic->cbs_dma_addr);\n \tif (!nic->cbs)\n \t\treturn -ENOMEM;\n@@ -2961,8 +2961,8 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \t\tnetif_err(nic, probe, nic->netdev, \"Cannot register net device, aborting\\n\");\n \t\tgoto err_out_free;\n \t}\n-\tnic->cbs_pool = pci_pool_create(netdev->name,\n-\t\t\t nic->pdev,\n+\tnic->cbs_pool = dma_pool_create(netdev->name,\n+\t\t\t &nic->pdev->dev,\n \t\t\t nic->params.cbs.max * sizeof(struct cb),\n \t\t\t sizeof(u32),\n \t\t\t 0);\n@@ -3002,7 +3002,7 @@ static void e100_remove(struct pci_dev *pdev)\n \t\tunregister_netdev(netdev);\n \t\te100_free(nic);\n \t\tpci_iounmap(pdev, nic->csr);\n-\t\tpci_pool_destroy(nic->cbs_pool);\n+\t\tdma_pool_destroy(nic->cbs_pool);\n \t\tfree_netdev(netdev);\n \t\tpci_release_regions(pdev);\n \t\tpci_disable_device(pdev);\n","prefixes":["v13","3/5"]}