From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on archive.lwn.net X-Spam-Level: X-Spam-Status: No, score=-5.7 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by archive.lwn.net (Postfix) with ESMTP id C76CC7D57F for ; Fri, 7 Sep 2018 10:08:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728819AbeIGOsz (ORCPT ); Fri, 7 Sep 2018 10:48:55 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:51252 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728690AbeIGOsz (ORCPT ); Fri, 7 Sep 2018 10:48:55 -0400 Received: by mail-wm0-f65.google.com with SMTP id y2-v6so14174442wma.1 for ; Fri, 07 Sep 2018 03:08:39 -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=Jj0PR2xarHrzaiJCeTNsc6tn7/LLDDEBk24k2KFri8YQ+G9+IpC/NKB0f0RCFAf1OV iVT8yidsjZzJOXnRISaB4gtSQJf089bKmrz9i1a9RcL5M7SvjkshV6OqUZjD1+nwhQ/V bbIWqlzaRwowHcxsapj0nOUP+406doDg8XJylXHbmlmg/1ZCi/hi2qcwKPCWmm/KzRDF ujbuk50t+Q+ayqwDdNJKow2d84rVyTYJsesNCo/Ajatdk4csjrneERIdqEbChod44QKn srECaVXfb2afVa4lKhHh7Y4+yf5LxYudvaYHoyfL/Dva5nw0cSKq+RAroZdNUJmVL8PF MX4Q== X-Gm-Message-State: APzg51D7aB/pBb8ZcE+IAK4CB8voaZWj4nCRV/6Vnzae3K7lt/AMb0m6 hEDmgKpSEBqpPHggWnPU6aDLvw== 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 Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski 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> Sender: linux-doc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org 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); } -- 2.18.0