nvmem: core: drop the removal of the cells in nvmem_add_cells()

If nvmem_add_cells() fails, the whole nvmem_register() will fail
and the cells will then be removed anyway. This is a preparation
to introduce a nvmem_add_one_cell() which can then be used by
nvmem_add_cells().

This is then the same to what nvmem_add_cells_from_table() and
nvmem_add_cells_from_of() do.

Signed-off-by: Michael Walle <michael@walle.cc>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230206134356.839737-15-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 30567dd51fbaef73ae92f23d5519566d6889b6ab..98ae70695f368c9c1a64e895867cd914f7f96f19 100644 (file)
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -515,7 +515,7 @@ static int nvmem_add_cells(struct nvmem_device *nvmem,
                    int ncells)
 {
        struct nvmem_cell_entry **cells;
-       int i, rval;
+       int i, rval = 0;
 
        cells = kcalloc(ncells, sizeof(*cells), GFP_KERNEL);
        if (!cells)
@@ -525,28 +525,22 @@ static int nvmem_add_cells(struct nvmem_device *nvmem,
                cells[i] = kzalloc(sizeof(**cells), GFP_KERNEL);
                if (!cells[i]) {
                        rval = -ENOMEM;
-                       goto err;
+                       goto out;
                }
 
                rval = nvmem_cell_info_to_nvmem_cell_entry(nvmem, &info[i], cells[i]);
                if (rval) {
                        kfree(cells[i]);
-                       goto err;
+                       goto out;
                }
 
                nvmem_cell_entry_add(cells[i]);
        }
 
+out:
        /* remove tmp array */
        kfree(cells);
 
-       return 0;
-err:
-       while (i--)
-               nvmem_cell_entry_drop(cells[i]);
-
-       kfree(cells);
-
        return rval;
 }