Skip to content

Commit

Permalink
nvmem: core: Create all cells before adding the nvmem device
Browse files Browse the repository at this point in the history
Let's pack all the cells creation in one place, so they are all created
before we add the nvmem device.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Michael Walle <michael@walle.cc>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230823132744.350618-20-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Miquel Raynal authored and Greg Kroah-Hartman committed Aug 23, 2023
1 parent 1006ebe commit f4d1d17
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/nvmem/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -997,17 +997,17 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
if (rval)
goto err_remove_cells;

dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name);

rval = device_add(&nvmem->dev);
rval = nvmem_add_cells_from_fixed_layout(nvmem);
if (rval)
goto err_remove_cells;

rval = nvmem_add_cells_from_fixed_layout(nvmem);
rval = nvmem_add_cells_from_layout(nvmem);
if (rval)
goto err_remove_cells;

rval = nvmem_add_cells_from_layout(nvmem);
dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name);

rval = device_add(&nvmem->dev);
if (rval)
goto err_remove_cells;

Expand Down

0 comments on commit f4d1d17

Please sign in to comment.