From patchwork Mon Oct 23 17:59:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Perier X-Patchwork-Id: 829547 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NC+apUNI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yLPN36Wvpz9sRg for ; Tue, 24 Oct 2017 05:01:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751562AbdJWSAx (ORCPT ); Mon, 23 Oct 2017 14:00:53 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:55131 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932400AbdJWSAY (ORCPT ); Mon, 23 Oct 2017 14:00:24 -0400 Received: by mail-wm0-f67.google.com with SMTP id r68so11501258wmr.3; Mon, 23 Oct 2017 11:00:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tBtICgQQ1bytD73vycnfRvWwaRTQZU0R0e68paHj6bQ=; b=NC+apUNI6cyYwQfsvvn4skA22oXdLPo0BkTtATUcDZ8pXh4FXbS7K2/ietG7ehFAPa xpdnlzgKc0CwEyrmFZVmjKurNpiF+LSkxiSL36lv/PJh5PbZ4+htFlO52TSckXXbAgBZ ZgNa8oBuph7Su1Pwr0Xa32I05/FeCqsQP5MA4Nsp+07ySlLxyFOxVB47DhW7HuxUjY9B 6iMQlkNZ4VHtkPJ3FWSongfaQEseHHjTz7Nye8+pGQ22mtn5nIOkyWGRyMtn5PvI/Ref ONITSbdpAQC5iOO1ooZ7t54nSND9EH+H/TXegseb4bCBigdV5YKiQw4wYpfOwnEu9jXk 2e1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tBtICgQQ1bytD73vycnfRvWwaRTQZU0R0e68paHj6bQ=; b=lwMwbkOWCFBTxX8zyuRzUR2C64kcq0IsjGgPPQl9dIGA9MDRBu30Zy31Ec6VpF57au blghlNaNA7czZDVLCpAYCT1JQkgxuhqiJx7stJj6kYdKuVaccbbSy+q6DntrBszA5Aa6 dREtVhUu4lUmCZaUfoNrNXibk9gqToB5pWcVo9FZI7bho9Tdr9KdEuPMeb7D508AM+OK J46l/ecQyj9wI7ORKM5imLWicfoBaZSUr/Ml0V4Z1YnoagGb/ArAYyMjLxdub2F6PZ0H ihWmvjjWM3slSADOkb2yaZURScPFLpwX0F3JTJ0HHVJ62DBOtWXMAj4q8iKPfJgIqfV3 Ayhw== X-Gm-Message-State: AMCzsaXCNg5CqhUaxKR5WZa7OWS5b9x1WPSe6ls/isrzHxAPmIFeZ7X8 +JNzOAMmRTslLPotb46J/ieLu3lTYWU= X-Google-Smtp-Source: ABhQp+QAcDNjaWUvfQgKbMa+Q0bpEdjXndrUn+L8JqzF9sWTvUduOMMwNsZAMm729ws5KGgTRib1/Q== X-Received: by 10.28.202.9 with SMTP id a9mr2172322wmg.46.1508781622746; Mon, 23 Oct 2017 11:00:22 -0700 (PDT) Received: from rperier-xps-l502x (AToulouse-651-1-13-242.w92-149.abo.wanadoo.fr. [92.149.188.242]) by smtp.gmail.com with ESMTPSA id o14sm5553242wra.54.2017.10.23.11.00.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 11:00:21 -0700 (PDT) From: Romain Perier To: Jens Axboe , Andrew Morton , Dan Williams , Vinod Koul , Jeff Kirsher , Aviad Krawczyk , Bjorn Helgaas , linux-pci@vger.kernel.org Cc: dmaengine@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Romain Perier Subject: [PATCH v14 4/5] hinic: Replace PCI pool old API Date: Mon, 23 Oct 2017 19:59:57 +0200 Message-Id: <20171023175958.8327-5-romain.perier@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171023175958.8327-1-romain.perier@gmail.com> References: <20171023175958.8327-1-romain.perier@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Romain Perier The PCI pool API is deprecated. This commit replaces the PCI pool old API by the appropriate function with the DMA pool API. Signed-off-by: Romain Perier --- drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 10 +++++----- drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c b/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c index 7d95f0866fb0..28a81ac97af5 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c @@ -143,7 +143,7 @@ int hinic_alloc_cmdq_buf(struct hinic_cmdqs *cmdqs, struct hinic_hwif *hwif = cmdqs->hwif; struct pci_dev *pdev = hwif->pdev; - cmdq_buf->buf = pci_pool_alloc(cmdqs->cmdq_buf_pool, GFP_KERNEL, + cmdq_buf->buf = dma_pool_alloc(cmdqs->cmdq_buf_pool, GFP_KERNEL, &cmdq_buf->dma_addr); if (!cmdq_buf->buf) { dev_err(&pdev->dev, "Failed to allocate cmd from the pool\n"); @@ -161,7 +161,7 @@ int hinic_alloc_cmdq_buf(struct hinic_cmdqs *cmdqs, void hinic_free_cmdq_buf(struct hinic_cmdqs *cmdqs, struct hinic_cmdq_buf *cmdq_buf) { - pci_pool_free(cmdqs->cmdq_buf_pool, cmdq_buf->buf, cmdq_buf->dma_addr); + dma_pool_free(cmdqs->cmdq_buf_pool, cmdq_buf->buf, cmdq_buf->dma_addr); } static unsigned int cmdq_wqe_size_from_bdlen(enum bufdesc_len len) @@ -875,7 +875,7 @@ int hinic_init_cmdqs(struct hinic_cmdqs *cmdqs, struct hinic_hwif *hwif, int err; cmdqs->hwif = hwif; - cmdqs->cmdq_buf_pool = pci_pool_create("hinic_cmdq", pdev, + cmdqs->cmdq_buf_pool = dma_pool_create("hinic_cmdq", &pdev->dev, HINIC_CMDQ_BUF_SIZE, HINIC_CMDQ_BUF_SIZE, 0); if (!cmdqs->cmdq_buf_pool) @@ -916,7 +916,7 @@ int hinic_init_cmdqs(struct hinic_cmdqs *cmdqs, struct hinic_hwif *hwif, devm_kfree(&pdev->dev, cmdqs->saved_wqs); err_saved_wqs: - pci_pool_destroy(cmdqs->cmdq_buf_pool); + dma_pool_destroy(cmdqs->cmdq_buf_pool); return err; } @@ -942,5 +942,5 @@ void hinic_free_cmdqs(struct hinic_cmdqs *cmdqs) devm_kfree(&pdev->dev, cmdqs->saved_wqs); - pci_pool_destroy(cmdqs->cmdq_buf_pool); + dma_pool_destroy(cmdqs->cmdq_buf_pool); } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h b/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h index b35583400cb6..23f8d39eab68 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h +++ b/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h @@ -157,7 +157,7 @@ struct hinic_cmdq { struct hinic_cmdqs { struct hinic_hwif *hwif; - struct pci_pool *cmdq_buf_pool; + struct dma_pool *cmdq_buf_pool; struct hinic_wq *saved_wqs;