From patchwork Fri Sep 7 10:07:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10592035 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 926E2112B for ; Fri, 7 Sep 2018 10:34:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F21F2AD94 for ; Fri, 7 Sep 2018 10:34:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 710712AE15; Fri, 7 Sep 2018 10:34:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B76BB2AD94 for ; Fri, 7 Sep 2018 10:34:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=sZsvc/sLokSsLli9ZXR6AifEGVfQQr++uvYPDH+OzxA=; b=TZmWHIvjOsAGbG0/UTwrNW5fkS lNHa41UoHguZpZ1OOtAbR7bDna5KashydQSImljgogFg8sJHBaNzolhAEwl2GFCjl4URH8RnJtH9X ryMehh9TvCzFW4+TWODr3Kkqo2eoEtT41+5mCJUTpYzxROOKDcmeUDJAdjLCd/IYdxrMZ6AeZ9QRb KOpFHXTO1zx6Yw1rxkbN19mpkAuJiJXiVQUARRfVGCkkP228WGwHzgpJgFdRNJj9ZdR7gAv3ZNvQz 1EyjpycBjhXXPTVFKZOedBpvxaTz1trkXx+3ymG2gwqIqrEWjgXbeDBmPZd9Y1IA+hHcDNZcmncrk 3+8h9/nQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fyE61-0005jn-9P; Fri, 07 Sep 2018 10:34:37 +0000 Received: from merlin.infradead.org ([205.233.59.134]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fyE5z-0005jW-Uf for linux-arm-kernel@bombadil.infradead.org; Fri, 07 Sep 2018 10:34:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=XDlS7q6y/Wy9nWc7nbll/DVBj4MgMyVUhgPfDRtNSjo=; b=2p58axN/ULIkBrJ58HjJaXoS+ OYSEoPufzW/cPQKzQtFvUQmvDFMS+JwMiYCoN3z8hoQ5bovxemmESs8Cp+d9W3AbpHa0XtNirtf+Z 7dGcSkO/bg3zprdzoNxQ4n9EwC700i2STMeYnzumHa6bZiI5GUXbV3QUFg9ZGJ7uGlKidjSIHwUe9 1jRceHXJNcbMj350c8GSxIRLnefml2wZz6Iqq+DEe1zE4exWEr3ebdxRvzKThG/q+/UX3EfI5NnQP UH6sGW5kZiMMVojtzPIhY+qkQck1mX+0tm4Iay4fnBsZ98h6YGuP7tAcnjkvauWCvl6fUvZYkYfHI FU14JknEA==; Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fyDi6-0000bJ-TH for linux-arm-kernel@lists.infradead.org; Fri, 07 Sep 2018 10:09:57 +0000 Received: by mail-wm0-x243.google.com with SMTP id s12-v6so14205018wmc.0 for ; Fri, 07 Sep 2018 03:09:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XDlS7q6y/Wy9nWc7nbll/DVBj4MgMyVUhgPfDRtNSjo=; b=Z4SAuD3x3tEQXKzMfDOpaftPGNjhzCYi5BaFpqPhhHOW3f5RUnF6gn7xB7N+2Ve+ya rQf3Q5h2m1pDjT/RATBOO5DEGo5QoxKGB3lyXZwYHfDWjYIRNLjP1PWQwvu6xya/XJ3Z AqBxA/g1pVWpvODIIEs4+IG0KyoNL1zUUVVhfFcyktX5+21FYr+eViKKOfMgop8zu0UJ dd+UDvfp4q9r5WlPZrMqB43Mg9B6jqia4NjlWKkd3GIOUWyTcucPicR2k1jX4aGhwSlX 9wrdUaMjxLvrsBj5ZOaVA0VwWopXMXXzqwkPlHHp1q8XQetTd3wMDHKqTs0JNpuMc6G/ TblA== 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=XDlS7q6y/Wy9nWc7nbll/DVBj4MgMyVUhgPfDRtNSjo=; b=S2mtAULshAlcgh2lwbS71FE+SmDLgINw6dBhrst3tHO2BfdiuuIAi3H9jeEb2PeoZY xytekGkJCkAnQ4TMZwTTaqnOuCvbSe7ClMOOFmWdhhYudn+V/fM8Cj94KLBSumoQEt2B CvZLJX2TtboV50yeqiWitbi+u3QwgMtj0OIcMvFzsxBTzxBwFrG34Em7MjFQ2bRAS/+M 7++Y7EP5rXONcW66fZjmyce5cTUvPb4BsZsYiU8hyhrHvVQ/RrZ31PZpvP4Bnknfn4wn U3wjb4Z2REhcWimOCzApMSGsaf8HCJtW13PmXm+UrRu9Fer+4Yf/l2pUwJxbtcxihscz 58tQ== X-Gm-Message-State: APzg51Creppw7e6uiNYrYNfRZr5oNWe/ETMm/3gsMdPlH5GRKUMfKqpN CmuBx/LA7guAQl+chSKr2OVHew== X-Google-Smtp-Source: ANB0VdZlVGl7ISwf8sv1ihjauPAij7GLIdF/FxZ8mhR0+hZuO5NDSDDPaz5enFXHugngShCmwah/wA== X-Received: by 2002:a1c:a60e:: with SMTP id p14-v6mr5089493wme.64.1536314919195; Fri, 07 Sep 2018 03:08:39 -0700 (PDT) Received: from brgl-bgdev.baylibre.local (AStLambert-681-1-83-232.w90-86.abo.wanadoo.fr. [90.86.25.232]) by smtp.gmail.com with ESMTPSA id 72-v6sm6631619wrb.48.2018.09.07.03.08.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Sep 2018 03:08:38 -0700 (PDT) From: Bartosz Golaszewski To: Srinivas Kandagatla , "David S . Miller" , Mauro Carvalho Chehab , Greg Kroah-Hartman , Andrew Morton , Arnd Bergmann , Jonathan Corbet , Sekhar Nori , Kevin Hilman , David Lechner , Boris Brezillon , Andrew Lunn , Alban Bedel , Maxime Ripard , Chen-Yu Tsai Subject: [PATCH v2 16/16] nvmem: make the naming of arguments in nvmem_cell_get() consistent Date: Fri, 7 Sep 2018 12:07:50 +0200 Message-Id: <20180907100750.14564-17-brgl@bgdev.pl> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180907100750.14564-1-brgl@bgdev.pl> References: <20180907100750.14564-1-brgl@bgdev.pl> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180907_060954_961831_0EEEB432 X-CRM114-Status: GOOD ( 20.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski The argument representing the cell name in the nvmem_cell_get() family of functions is not consistend between function prototypes and definitions. Name it 'id' in all those routines. This is in line with other frameworks and can represent both the DT cell name from the nvmem-cell-names property as well as the con_id field from cell lookup entries. Signed-off-by: Bartosz Golaszewski --- drivers/nvmem/core.c | 27 ++++++++++++++------------- include/linux/nvmem-consumer.h | 12 ++++++------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 320b3cc975a0..efcc41ba487d 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -873,16 +873,15 @@ EXPORT_SYMBOL_GPL(devm_nvmem_device_get); * of_nvmem_cell_get() - Get a nvmem cell from given device node and cell id * * @np: Device tree node that uses the nvmem cell. - * @name: nvmem cell name from nvmem-cell-names property, or NULL - * for the cell at index 0 (the lone cell with no accompanying - * nvmem-cell-names property). + * @id: nvmem cell name from nvmem-cell-names property, or NULL + * for the cell at index 0 (the lone cell with no accompanying + * nvmem-cell-names property). * * Return: Will be an ERR_PTR() on error or a valid pointer * to a struct nvmem_cell. The nvmem_cell will be freed by the * nvmem_cell_put(). */ -struct nvmem_cell *of_nvmem_cell_get(struct device_node *np, - const char *name) +struct nvmem_cell *of_nvmem_cell_get(struct device_node *np, const char *id) { struct device_node *cell_np, *nvmem_np; struct nvmem_device *nvmem; @@ -890,8 +889,8 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np, int index = 0; /* if cell name exists, find index to the name */ - if (name) - index = of_property_match_string(np, "nvmem-cell-names", name); + if (id) + index = of_property_match_string(np, "nvmem-cell-names", id); cell_np = of_parse_phandle(np, "nvmem-cells", index); if (!cell_np) @@ -959,22 +958,24 @@ nvmem_cell_get_from_lookup(struct device *dev, const char *con_id) * nvmem_cell_get() - Get nvmem cell of device form a given cell name * * @dev: Device that requests the nvmem cell. - * @cell_id: nvmem cell name to get. + * @id: nvmem cell name to get (this corresponds with the name from the + * nvmem-cell-names property for DT systems and with the con_id from + * the lookup entry for non-DT systems). * * Return: Will be an ERR_PTR() on error or a valid pointer * to a struct nvmem_cell. The nvmem_cell will be freed by the * nvmem_cell_put(). */ -struct nvmem_cell *nvmem_cell_get(struct device *dev, const char *cell_id) +struct nvmem_cell *nvmem_cell_get(struct device *dev, const char *id) { if (dev->of_node) - return of_nvmem_cell_get(dev->of_node, cell_id); + return of_nvmem_cell_get(dev->of_node, id); - /* Only allow empty cell_id for DT systems. */ - if (!cell_id) + /* Only allow empty cell id for DT systems. */ + if (!id) return ERR_PTR(-EINVAL); - return nvmem_cell_get_from_lookup(dev, cell_id); + return nvmem_cell_get_from_lookup(dev, id); } EXPORT_SYMBOL_GPL(nvmem_cell_get); diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h index 4c146379b9ba..31ff907c7fe7 100644 --- a/include/linux/nvmem-consumer.h +++ b/include/linux/nvmem-consumer.h @@ -27,8 +27,8 @@ enum { #if IS_ENABLED(CONFIG_NVMEM) /* Cell based interface */ -struct nvmem_cell *nvmem_cell_get(struct device *dev, const char *name); -struct nvmem_cell *devm_nvmem_cell_get(struct device *dev, const char *name); +struct nvmem_cell *nvmem_cell_get(struct device *dev, const char *id); +struct nvmem_cell *devm_nvmem_cell_get(struct device *dev, const char *id); void nvmem_cell_put(struct nvmem_cell *cell); void devm_nvmem_cell_put(struct device *dev, struct nvmem_cell *cell); void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len); @@ -54,13 +54,13 @@ int nvmem_unregister_notifier(struct notifier_block *nb); #else static inline struct nvmem_cell *nvmem_cell_get(struct device *dev, - const char *name) + const char *id) { return ERR_PTR(-ENOSYS); } static inline struct nvmem_cell *devm_nvmem_cell_get(struct device *dev, - const char *name) + const char *id) { return ERR_PTR(-ENOSYS); } @@ -145,12 +145,12 @@ static inline int nvmem_unregister_notifier(struct notifier_block *nb) #if IS_ENABLED(CONFIG_NVMEM) && IS_ENABLED(CONFIG_OF) struct nvmem_cell *of_nvmem_cell_get(struct device_node *np, - const char *name); + const char *id); struct nvmem_device *of_nvmem_device_get(struct device_node *np, const char *name); #else static inline struct nvmem_cell *of_nvmem_cell_get(struct device_node *np, - const char *name) + const char *id) { return ERR_PTR(-ENOSYS); }