lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <20171227225956.14442-2-andrew.smirnov@gmail.com> Date: Wed, 27 Dec 2017 14:59:37 -0800 From: Andrey Smirnov <andrew.smirnov@...il.com> To: Srinivas Kandagatla <srinivas.kandagatla@...aro.org> Cc: Andrey Smirnov <andrew.smirnov@...il.com>, Heiko Stuebner <heiko@...ech.de>, Masahiro Yamada <yamada.masahiro@...ionext.com>, Carlo Caione <carlo@...one.org>, Kevin Hilman <khilman@...libre.com>, Matthias Brugger <matthias.bgg@...il.com>, Joachim Eastwood <manabian@...il.com>, cphealy@...il.com, linux-kernel@...r.kernel.org, linux-mediatek@...ts.infradead.org, linux-rockchip@...ts.infradead.org, linux-amlogic@...ts.infradead.org, linux-arm-kernel@...ts.infradead.org Subject: [PATCH 01/20] nvmem: core: Allow specifying device name verbatim 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.kandagatla@...aro.org> Cc: Heiko Stuebner <heiko@...ech.de> Cc: Masahiro Yamada <yamada.masahiro@...ionext.com> Cc: Carlo Caione <carlo@...one.org> Cc: Kevin Hilman <khilman@...libre.com> Cc: Matthias Brugger <matthias.bgg@...il.com> Cc: Joachim Eastwood <manabian@...il.com> Cc: cphealy@...il.com Cc: linux-kernel@...r.kernel.org Cc: linux-mediatek@...ts.infradead.org Cc: linux-rockchip@...ts.infradead.org Cc: linux-amlogic@...ts.infradead.org Cc: linux-arm-kernel@...ts.infradead.org Signed-off-by: Andrey Smirnov <andrew.smirnov@...il.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
Powered by blists - more mailing lists