From patchwork Wed Apr 27 17:28:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= X-Patchwork-Id: 8960821 Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 72BAA9F441 for ; Wed, 27 Apr 2016 17:29:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9B31E200F2 for ; Wed, 27 Apr 2016 17:29:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A2C9F2021F for ; Wed, 27 Apr 2016 17:29:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753740AbcD0R3q (ORCPT ); Wed, 27 Apr 2016 13:29:46 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:37209 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753522AbcD0R3G (ORCPT ); Wed, 27 Apr 2016 13:29:06 -0400 Received: by mail-wm0-f49.google.com with SMTP id a17so25749107wme.0 for ; Wed, 27 Apr 2016 10:29:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lightnvm-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qXqmsIsA75zUfKZKkTkdtPHxfCItAzlvSoMKKSQO9bw=; b=PVWB31pJaYcQj4ZRHSmUlD3tHdya9BjzGMUfqOta8A3385ODR+fnTxvjvZyWKk90V6 kHFeVUG355s1YXR3ftSbeTi5vFl+r7n4vcav84TK1L4ESzSAqbxwN7gngve00Hmd0Ojq d6mOWUp9fpX0fc5hxSC0j9fx+H/iOosPh/WmF3A30gEWZqSvYvUzBzQh7E5MrO2gMyq0 Q+AfU7kIItKLb9Thl59N54cUAgt5qI9rWdFtCikyIbASxm2sTaNFHGdQs5w/pW+ijHhl 8F3y6nKfPgWWVp4Y0bt0XhkKgi5MigGfbT5Ta00AhXr1zEFY5E3NJbFoQBZvkQ/TQOSb wygA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qXqmsIsA75zUfKZKkTkdtPHxfCItAzlvSoMKKSQO9bw=; b=OlpWriEhKiOznQKpGkP7JdNXRhNiDJBXZ4NHe59OMFhbtl5z+pYJwFsnTiIwqe4bJR +mJkJ6KQvnXU+SrJGSWZeBnoQQuQ42TPRy+WtrGF7TOyA0gxz74NFZyeJmXLcevdevut NAG/awmsZl+OvchdjL3wnTXEqZcFx2QlY2dM4at5ws9gQwSkECCZ9Sr6Os5PhItfVbSk zrxI1Mcc3I5+rv2A7Si9LNlxud18bb9gRCRS6jLd5hDbH+tuEZ9WDQqXGV2tUPFY41LR /if5ICsRizH7OjU3jLu3dPV6XS1+eG0L/8hVFg3AKpuzoRPhWly3vLQQoH1F1XdZzTgZ C4Pw== X-Gm-Message-State: AOPr4FXgnaZlec9GWhUWnScDWQQoAsfNxxiw8FMgEyhfMor2hEKsFp+VyQanyOOXiOp3XQ== X-Received: by 10.28.41.70 with SMTP id p67mr25428634wmp.70.1461778145049; Wed, 27 Apr 2016 10:29:05 -0700 (PDT) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id o128sm9496766wmb.19.2016.04.27.10.29.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Apr 2016 10:29:04 -0700 (PDT) From: "=?UTF-8?q?Javier=20Gonz=C3=A1lez?=" X-Google-Original-From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= To: mb@lightnvm.io Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= Subject: [PATCH 3/3] lightnvm: rename dma helper functions Date: Wed, 27 Apr 2016 19:28:58 +0200 Message-Id: <1461778138-23116-3-git-send-email-javier@javigon.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461778138-23116-1-git-send-email-javier@javigon.com> References: <1461778138-23116-1-git-send-email-javier@javigon.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Until now, the dma pool have been exclusively used to allocate the ppa list being sent to the device. In pblk (upcoming), we use these pools to allocate metadata too. Thus, we generalize the names of some variables on the dma helper functions to make the code more readable. Signed-off-by: Javier González --- drivers/lightnvm/core.c | 14 +++++++------- drivers/nvme/host/lightnvm.c | 4 ++-- include/linux/lightnvm.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c index 9b6c1c9..cb21331 100644 --- a/drivers/lightnvm/core.c +++ b/drivers/lightnvm/core.c @@ -87,15 +87,15 @@ EXPORT_SYMBOL(nvm_unregister_tgt_type); void *nvm_dev_dma_alloc(struct nvm_dev *dev, gfp_t mem_flags, dma_addr_t *dma_handler) { - return dev->ops->dev_dma_alloc(dev, dev->ppalist_pool, mem_flags, + return dev->ops->dev_dma_alloc(dev, dev->dma_page_pool, mem_flags, dma_handler); } EXPORT_SYMBOL(nvm_dev_dma_alloc); -void nvm_dev_dma_free(struct nvm_dev *dev, void *ppa_list, +void nvm_dev_dma_free(struct nvm_dev *dev, void *addr, dma_addr_t dma_handler) { - dev->ops->dev_dma_free(dev->ppalist_pool, ppa_list, dma_handler); + dev->ops->dev_dma_free(dev->dma_page_pool, addr, dma_handler); } EXPORT_SYMBOL(nvm_dev_dma_free); @@ -653,8 +653,8 @@ err: static void nvm_exit(struct nvm_dev *dev) { - if (dev->ppalist_pool) - dev->ops->destroy_dma_pool(dev->ppalist_pool); + if (dev->dma_page_pool) + dev->ops->destroy_dma_pool(dev->dma_page_pool); nvm_free(dev); pr_info("nvm: successfully unloaded\n"); @@ -688,8 +688,8 @@ int nvm_register(struct request_queue *q, char *disk_name, } if (dev->ops->max_phys_sect > 1) { - dev->ppalist_pool = dev->ops->create_dma_pool(dev, "ppalist"); - if (!dev->ppalist_pool) { + dev->dma_page_pool = dev->ops->create_dma_pool(dev, "ppalist"); + if (!dev->dma_page_pool) { pr_err("nvm: could not create ppa pool\n"); ret = -ENOMEM; goto err_init; diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index 76f1199..33f2315 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c @@ -565,10 +565,10 @@ static void *nvme_nvm_dev_dma_alloc(struct nvm_dev *dev, void *pool, return dma_pool_alloc(pool, mem_flags, dma_handler); } -static void nvme_nvm_dev_dma_free(void *pool, void *ppa_list, +static void nvme_nvm_dev_dma_free(void *pool, void *addr, dma_addr_t dma_handler) { - dma_pool_free(pool, ppa_list, dma_handler); + dma_pool_free(pool, addr, dma_handler); } static struct nvm_dev_ops nvme_nvm_dev_ops = { diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h index 9d8a350..7c615b0 100644 --- a/include/linux/lightnvm.h +++ b/include/linux/lightnvm.h @@ -368,7 +368,7 @@ struct nvm_dev { unsigned max_pages_per_blk; unsigned long *lun_map; - void *ppalist_pool; + void *dma_page_pool; struct nvm_id identity;