nvmem: core: switch to use device_add_groups()
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 30 Apr 2024 08:49:16 +0000 (09:49 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 May 2024 05:26:38 +0000 (07:26 +0200)
devm_device_add_groups() is being removed from the kernel, so move the
nvmem driver to use device_add_groups() instead.  The logic is
identical, when the device is removed the driver core will properly
clean up and remove the groups, and the memory used by the attribute
groups will be freed because it was created with dev_* calls, so this is
functionally identical overall.

Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20240430084921.33387-7-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/nvmem/core.c

index 2c6b99402df8a76011c2165fb8841ae2ff7fcc1f..e1ec3b7200d7b40c50a2a888bb74983dcfc0ee08 100644 (file)
@@ -478,7 +478,7 @@ static int nvmem_populate_sysfs_cells(struct nvmem_device *nvmem)
 
        nvmem_cells_group.bin_attrs = cells_attrs;
 
-       ret = devm_device_add_groups(&nvmem->dev, nvmem_cells_groups);
+       ret = device_add_groups(&nvmem->dev, nvmem_cells_groups);
        if (ret)
                goto unlock_mutex;