Add code to allow avoid having nvmem core append a numeric suffix to the end of the name by passing config->id of -1.
Cc: Srinivas Kandagatla <srinivas.kandaga...@linaro.org> Cc: Heiko Stuebner <he...@sntech.de> Cc: Masahiro Yamada <yamada.masah...@socionext.com> Cc: Carlo Caione <ca...@caione.org> Cc: Kevin Hilman <khil...@baylibre.com> Cc: Matthias Brugger <matthias....@gmail.com> Cc: Joachim Eastwood <manab...@gmail.com> Cc: cphe...@gmail.com Cc: linux-kernel@vger.kernel.org Cc: linux-media...@lists.infradead.org Cc: linux-rockc...@lists.infradead.org Cc: linux-amlo...@lists.infradead.org Cc: linux-arm-ker...@lists.infradead.org Signed-off-by: Andrey Smirnov <andrew.smir...@gmail.com> --- drivers/nvmem/core.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 5a5cefd12153..57cbeacfbeb2 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -475,9 +475,14 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->reg_write = config->reg_write; np = config->dev->of_node; nvmem->dev.of_node = np; - dev_set_name(&nvmem->dev, "%s%d", - config->name ? : "nvmem", - config->name ? config->id : nvmem->id); + + if (config->id == -1 && config->name) { + dev_set_name(&nvmem->dev, "%s", config->name); + } else { + dev_set_name(&nvmem->dev, "%s%d", + config->name ? : "nvmem", + config->name ? config->id : nvmem->id); + } nvmem->read_only = of_property_read_bool(np, "read-only") | config->read_only; -- 2.14.3