{"id":810452,"url":"http://patchwork.ozlabs.org/api/patches/810452/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170906090857.14846-5-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-5-romain.perier@collabora.com>","list_archive_url":null,"date":"2017-09-06T09:08:56","name":"[v13,4/5] hinic: Replace PCI pool old API","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"2721cb88d867c57a063444a8b382d408b82d28be","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-5-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/810452/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810452/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 3xnHpr1v1vz9ryv\n\tfor ;\n\tWed, 6 Sep 2017 19:09:56 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752632AbdIFJJo (ORCPT );\n\tWed, 6 Sep 2017 05:09:44 -0400","from bhuna.collabora.co.uk ([46.235.227.227]:50688 \"EHLO\n\tbhuna.collabora.co.uk\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752550AbdIFJJe (ORCPT\n\t); Wed, 6 Sep 2017 05:09:34 -0400","from [127.0.0.1] (localhost [127.0.0.1])\n\t(Authenticated sender: rperier) with ESMTPSA id 7200226869F"],"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 4/5] hinic: Replace PCI pool old API","Date":"Wed, 6 Sep 2017 11:08:56 +0200","Message-Id":"<20170906090857.14846-5-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 \n---\n drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 10 +++++-----\n drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h | 2 +-\n 2 files changed, 6 insertions(+), 6 deletions(-)","diff":"diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c b/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c\nindex 7d95f0866fb0..28a81ac97af5 100644\n--- a/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c\n+++ b/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c\n@@ -143,7 +143,7 @@ int hinic_alloc_cmdq_buf(struct hinic_cmdqs *cmdqs,\n \tstruct hinic_hwif *hwif = cmdqs->hwif;\n \tstruct pci_dev *pdev = hwif->pdev;\n \n-\tcmdq_buf->buf = pci_pool_alloc(cmdqs->cmdq_buf_pool, GFP_KERNEL,\n+\tcmdq_buf->buf = dma_pool_alloc(cmdqs->cmdq_buf_pool, GFP_KERNEL,\n \t\t\t\t &cmdq_buf->dma_addr);\n \tif (!cmdq_buf->buf) {\n \t\tdev_err(&pdev->dev, \"Failed to allocate cmd from the pool\\n\");\n@@ -161,7 +161,7 @@ int hinic_alloc_cmdq_buf(struct hinic_cmdqs *cmdqs,\n void hinic_free_cmdq_buf(struct hinic_cmdqs *cmdqs,\n \t\t\t struct hinic_cmdq_buf *cmdq_buf)\n {\n-\tpci_pool_free(cmdqs->cmdq_buf_pool, cmdq_buf->buf, cmdq_buf->dma_addr);\n+\tdma_pool_free(cmdqs->cmdq_buf_pool, cmdq_buf->buf, cmdq_buf->dma_addr);\n }\n \n static unsigned int cmdq_wqe_size_from_bdlen(enum bufdesc_len len)\n@@ -875,7 +875,7 @@ int hinic_init_cmdqs(struct hinic_cmdqs *cmdqs, struct hinic_hwif *hwif,\n \tint err;\n \n \tcmdqs->hwif = hwif;\n-\tcmdqs->cmdq_buf_pool = pci_pool_create(\"hinic_cmdq\", pdev,\n+\tcmdqs->cmdq_buf_pool = dma_pool_create(\"hinic_cmdq\", &pdev->dev,\n \t\t\t\t\t HINIC_CMDQ_BUF_SIZE,\n \t\t\t\t\t HINIC_CMDQ_BUF_SIZE, 0);\n \tif (!cmdqs->cmdq_buf_pool)\n@@ -916,7 +916,7 @@ int hinic_init_cmdqs(struct hinic_cmdqs *cmdqs, struct hinic_hwif *hwif,\n \tdevm_kfree(&pdev->dev, cmdqs->saved_wqs);\n \n err_saved_wqs:\n-\tpci_pool_destroy(cmdqs->cmdq_buf_pool);\n+\tdma_pool_destroy(cmdqs->cmdq_buf_pool);\n \treturn err;\n }\n \n@@ -942,5 +942,5 @@ void hinic_free_cmdqs(struct hinic_cmdqs *cmdqs)\n \n \tdevm_kfree(&pdev->dev, cmdqs->saved_wqs);\n \n-\tpci_pool_destroy(cmdqs->cmdq_buf_pool);\n+\tdma_pool_destroy(cmdqs->cmdq_buf_pool);\n }\ndiff --git a/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h b/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h\nindex b35583400cb6..23f8d39eab68 100644\n--- a/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h\n+++ b/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h\n@@ -157,7 +157,7 @@ struct hinic_cmdq {\n struct hinic_cmdqs {\n \tstruct hinic_hwif *hwif;\n \n-\tstruct pci_pool *cmdq_buf_pool;\n+\tstruct dma_pool *cmdq_buf_pool;\n \n \tstruct hinic_wq *saved_wqs;\n \n","prefixes":["v13","4/5"]}