| Message ID | 1488484223-844-4-git-send-email-albeu@free.fr |
|---|---|
| State | Superseded |
| Headers | show |
On Thu, 2 Mar 2017 20:50:23 +0100 Alban <albeu@free.fr> wrote: > Currently the nvmem core expect the config to provide a name and ID > that are then used to create the device name. When no device name is > given 'nvmem' is used. However if there is several such anonymous > devices they all get named 'nvmem0', which doesn't work. > > To fix this problem use the ID from the config only when the config > also provides a name. When no name is provided take the uinque ID of > the nvmem device instead. > > Signed-off-by: Alban <albeu@free.fr> Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com> > --- > drivers/nvmem/core.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c > index 408b521..8c830a8 100644 > --- a/drivers/nvmem/core.c > +++ b/drivers/nvmem/core.c > @@ -468,7 +468,8 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) > np = config->dev->of_node; > nvmem->dev.of_node = np; > dev_set_name(&nvmem->dev, "%s%d", > - config->name ? : "nvmem", config->id); > + config->name ? : "nvmem", > + config->name ? config->id : nvmem->id); > > nvmem->read_only = of_property_read_bool(np, "read-only") | > config->read_only;
On Thu, Mar 2, 2017 at 12:03 PM, Boris Brezillon <boris.brezillon@free-electrons.com> wrote: > On Thu, 2 Mar 2017 20:50:23 +0100 > Alban <albeu@free.fr> wrote: > >> Currently the nvmem core expect the config to provide a name and ID >> that are then used to create the device name. When no device name is >> given 'nvmem' is used. However if there is several such anonymous >> devices they all get named 'nvmem0', which doesn't work. >> >> To fix this problem use the ID from the config only when the config >> also provides a name. When no name is provided take the uinque ID of >> the nvmem device instead. >> >> Signed-off-by: Alban <albeu@free.fr> > > Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com> Reviewed-by: Moritz Fischer <mdf@kernel.org> Thanks, Moritz
On 02/03/17 19:50, Alban wrote: > Currently the nvmem core expect the config to provide a name and ID > that are then used to create the device name. When no device name is > given 'nvmem' is used. However if there is several such anonymous > devices they all get named 'nvmem0', which doesn't work. > > To fix this problem use the ID from the config only when the config > also provides a name. When no name is provided take the uinque ID of > the nvmem device instead. > > Signed-off-by: Alban <albeu@free.fr> > --- Thanks for the Fix, looks good to me, I will queue this up once rc1 is out. > drivers/nvmem/core.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c > index 408b521..8c830a8 100644 > --- a/drivers/nvmem/core.c > +++ b/drivers/nvmem/core.c > @@ -468,7 +468,8 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) > np = config->dev->of_node; > nvmem->dev.of_node = np; > dev_set_name(&nvmem->dev, "%s%d", > - config->name ? : "nvmem", config->id); > + config->name ? : "nvmem", > + config->name ? config->id : nvmem->id); > > nvmem->read_only = of_property_read_bool(np, "read-only") | > config->read_only; >
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 408b521..8c830a8 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -468,7 +468,8 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) np = config->dev->of_node; nvmem->dev.of_node = np; dev_set_name(&nvmem->dev, "%s%d", - config->name ? : "nvmem", config->id); + config->name ? : "nvmem", + config->name ? config->id : nvmem->id); nvmem->read_only = of_property_read_bool(np, "read-only") | config->read_only;
Currently the nvmem core expect the config to provide a name and ID that are then used to create the device name. When no device name is given 'nvmem' is used. However if there is several such anonymous devices they all get named 'nvmem0', which doesn't work. To fix this problem use the ID from the config only when the config also provides a name. When no name is provided take the uinque ID of the nvmem device instead. Signed-off-by: Alban <albeu@free.fr> --- drivers/nvmem/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)