| Message ID | 20180101232310.30420-2-andrew.smirnov@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Thanks for the Patch, On 01/01/18 23:22, Andrey Smirnov wrote: > 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@linaro.org> > Cc: Heiko Stuebner <heiko@sntech.de> > Cc: Masahiro Yamada <yamada.masahiro@socionext.com> > Cc: Carlo Caione <carlo@caione.org> > Cc: Kevin Hilman <khilman@baylibre.com> > Cc: Matthias Brugger <matthias.bgg@gmail.com> > Cc: cphealy@gmail.com > Cc: linux-kernel@vger.kernel.org > Cc: linux-mediatek@lists.infradead.org > Cc: linux-rockchip@lists.infradead.org > Cc: linux-amlogic@lists.infradead.org > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> > --- > drivers/nvmem/core.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > This looks fine for me, Can you also add a line in kernel doc about this behavior. thanks, srini > 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; >
On Tue, Jan 2, 2018 at 3:44 AM, Srinivas Kandagatla <srinivas.kandagatla@linaro.org> wrote: > Thanks for the Patch, > > On 01/01/18 23:22, Andrey Smirnov wrote: >> >> 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@linaro.org> >> Cc: Heiko Stuebner <heiko@sntech.de> >> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> >> Cc: Carlo Caione <carlo@caione.org> >> Cc: Kevin Hilman <khilman@baylibre.com> >> Cc: Matthias Brugger <matthias.bgg@gmail.com> >> Cc: cphealy@gmail.com >> Cc: linux-kernel@vger.kernel.org >> Cc: linux-mediatek@lists.infradead.org >> Cc: linux-rockchip@lists.infradead.org >> Cc: linux-amlogic@lists.infradead.org >> Cc: linux-arm-kernel@lists.infradead.org >> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> >> --- >> drivers/nvmem/core.c | 11 ++++++++--- >> 1 file changed, 8 insertions(+), 3 deletions(-) >> > This looks fine for me, Can you also add a line in kernel doc about this > behavior. > Sure, will do in v3. Thanks, Andrey Smirnov
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;
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@linaro.org> Cc: Heiko Stuebner <heiko@sntech.de> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Carlo Caione <carlo@caione.org> Cc: Kevin Hilman <khilman@baylibre.com> Cc: Matthias Brugger <matthias.bgg@gmail.com> Cc: cphealy@gmail.com Cc: linux-kernel@vger.kernel.org Cc: linux-mediatek@lists.infradead.org Cc: linux-rockchip@lists.infradead.org Cc: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> --- drivers/nvmem/core.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)