nvmem: core: use device_register and device_unregister

use device_register/unregister instead of spliting them with no use.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200324171600.15606-2-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 acf75939df4d1f6988f84081f439f4fd49f9884f..7d28e1cca4e0f38a1cd5c5a0aa38d78927204d55 100644 (file)
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -398,11 +398,9 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
 
        nvmem->dev.groups = nvmem_sysfs_get_groups(nvmem, config);
 
-       device_initialize(&nvmem->dev);
-
        dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name);
 
-       rval = device_add(&nvmem->dev);
+       rval = device_register(&nvmem->dev);
        if (rval)
                goto err_put_device;
 
@@ -456,8 +454,7 @@ static void nvmem_device_release(struct kref *kref)
                device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom);
 
        nvmem_device_remove_all_cells(nvmem);
-       device_del(&nvmem->dev);
-       put_device(&nvmem->dev);
+       device_unregister(&nvmem->dev);
 }
 
 /**