From: Bartosz Golaszewski <brgl@bgdev.pl> To: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>, "David S . Miller" <davem@davemloft.net>, Mauro Carvalho Chehab <mchehab+samsung@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Andrew Morton <akpm@linux-foundation.org>, Arnd Bergmann <arnd@arndb.de>, Jonathan Corbet <corbet@lwn.net>, Sekhar Nori <nsekhar@ti.com>, Kevin Hilman <khilman@kernel.org>, David Lechner <david@lechnology.com>, Boris Brezillon <boris.brezillon@bootlin.com>, Andrew Lunn <andrew@lunn.ch>, Alban Bedel <albeu@free.fr>, Maxime Ripard <maxime.ripard@bootlin.com>, Chen-Yu Tsai <wens@csie.org> Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski <bgolaszewski@baylibre.com> Subject: [PATCH v3 18/21] nvmem: make the naming of arguments in nvmem_cell_get() consistent Date: Wed, 12 Sep 2018 09:51:26 +0200 [thread overview] Message-ID: <20180912075129.25185-19-brgl@bgdev.pl> (raw) In-Reply-To: <20180912075129.25185-1-brgl@bgdev.pl> From: Bartosz Golaszewski <bgolaszewski@baylibre.com> 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 <bgolaszewski@baylibre.com> --- 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 6cdf4f2678f6..f4930f605d4f 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -977,16 +977,15 @@ nvmem_cell_get_from_lookup(struct device *dev, const char *con_id) * 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; @@ -994,8 +993,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) @@ -1025,27 +1024,29 @@ EXPORT_SYMBOL_GPL(of_nvmem_cell_get); * 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) { struct nvmem_cell *cell; if (dev->of_node) { /* try dt first */ - cell = of_nvmem_cell_get(dev->of_node, cell_id); + cell = of_nvmem_cell_get(dev->of_node, id); if (!IS_ERR(cell) || PTR_ERR(cell) == -EPROBE_DEFER) return cell; } - /* NULL cell_id only allowed for device tree; invalid otherwise */ - if (!cell_id) + /* NULL cell id only allowed for device tree; invalid otherwise */ + 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 d18caae2f7ac..e17617fa034f 100644 --- a/include/linux/nvmem-consumer.h +++ b/include/linux/nvmem-consumer.h @@ -55,8 +55,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); @@ -91,13 +91,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); } @@ -201,12 +201,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
WARNING: multiple messages have this Message-ID (diff)
From: brgl@bgdev.pl (Bartosz Golaszewski) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 18/21] nvmem: make the naming of arguments in nvmem_cell_get() consistent Date: Wed, 12 Sep 2018 09:51:26 +0200 [thread overview] Message-ID: <20180912075129.25185-19-brgl@bgdev.pl> (raw) In-Reply-To: <20180912075129.25185-1-brgl@bgdev.pl> From: Bartosz Golaszewski <bgolaszewski@baylibre.com> 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 <bgolaszewski@baylibre.com> --- 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 6cdf4f2678f6..f4930f605d4f 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -977,16 +977,15 @@ nvmem_cell_get_from_lookup(struct device *dev, const char *con_id) * 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; @@ -994,8 +993,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) @@ -1025,27 +1024,29 @@ EXPORT_SYMBOL_GPL(of_nvmem_cell_get); * 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) { struct nvmem_cell *cell; if (dev->of_node) { /* try dt first */ - cell = of_nvmem_cell_get(dev->of_node, cell_id); + cell = of_nvmem_cell_get(dev->of_node, id); if (!IS_ERR(cell) || PTR_ERR(cell) == -EPROBE_DEFER) return cell; } - /* NULL cell_id only allowed for device tree; invalid otherwise */ - if (!cell_id) + /* NULL cell id only allowed for device tree; invalid otherwise */ + 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 d18caae2f7ac..e17617fa034f 100644 --- a/include/linux/nvmem-consumer.h +++ b/include/linux/nvmem-consumer.h @@ -55,8 +55,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); @@ -91,13 +91,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); } @@ -201,12 +201,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
next prev parent reply other threads:[~2018-09-12 7:52 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-12 7:51 [PATCH v3 00/21] nvmem: rework of the subsystem for non-DT users Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 01/21] nvmem: provide nvmem_dev_name() Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 02/21] nvmem: remove the name field from struct nvmem_device Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 03/21] nvmem: use list_for_each_entry_safe in nvmem_device_remove_all_cells() Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 04/21] nvmem: remove a stray newline Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 05/21] nvmem: check the return value of nvmem_add_cells() Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 06/21] nvmem: use kref Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 07/21] nvmem: lpc18xx_eeprom: use devm_nvmem_register() Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 08/21] nvmem: sunxi_sid: " Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-13 1:38 ` kbuild test robot 2018-09-13 1:38 ` kbuild test robot 2018-09-13 8:39 ` Bartosz Golaszewski 2018-09-13 8:39 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 09/21] nvmem: mxs-ocotp: " Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 10/21] nvmem: change the signature of nvmem_unregister() Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-13 0:34 ` kbuild test robot 2018-09-13 0:34 ` kbuild test robot 2018-09-13 1:46 ` kbuild test robot 2018-09-13 1:46 ` kbuild test robot 2018-09-12 7:51 ` [PATCH v3 11/21] nvmem: remove the global cell list Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 12/21] nvmem: add support for cell info Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 13/21] nvmem: resolve cells from DT at registration time Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 14/21] nvmem: add support for cell lookups from machine code Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 15/21] Documentation: nvmem: document cell tables and lookup entries Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 16/21] nvmem: add a notifier chain Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 9:33 ` Bartosz Golaszewski 2018-09-12 9:33 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 17/21] nvmem: use SPDX license identifiers Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski [this message] 2018-09-12 7:51 ` [PATCH v3 18/21] nvmem: make the naming of arguments in nvmem_cell_get() consistent Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 19/21] nvmem: use EOPNOTSUPP instead of ENOSYS Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 20/21] nvmem: fix commenting style Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-12 7:51 ` [PATCH v3 21/21] nvmem: use octal permissions instead of constants Bartosz Golaszewski 2018-09-12 7:51 ` Bartosz Golaszewski 2018-09-14 14:43 ` [PATCH v3 00/21] nvmem: rework of the subsystem for non-DT users Bartosz Golaszewski 2018-09-14 14:43 ` Bartosz Golaszewski
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180912075129.25185-19-brgl@bgdev.pl \ --to=brgl@bgdev.pl \ --cc=akpm@linux-foundation.org \ --cc=albeu@free.fr \ --cc=andrew@lunn.ch \ --cc=arnd@arndb.de \ --cc=bgolaszewski@baylibre.com \ --cc=boris.brezillon@bootlin.com \ --cc=corbet@lwn.net \ --cc=davem@davemloft.net \ --cc=david@lechnology.com \ --cc=gregkh@linuxfoundation.org \ --cc=khilman@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=maxime.ripard@bootlin.com \ --cc=mchehab+samsung@kernel.org \ --cc=nsekhar@ti.com \ --cc=srinivas.kandagatla@linaro.org \ --cc=wens@csie.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.