econfig.reg_read = match->data;
        econfig.priv = efuse;
        econfig.dev = efuse->dev;
-       nvmem = nvmem_register(&econfig);
-       if (IS_ERR(nvmem))
-               return PTR_ERR(nvmem);
+       nvmem = devm_nvmem_register(dev, &econfig);
 
-       platform_set_drvdata(pdev, nvmem);
-
-       return 0;
-}
-
-static int rockchip_efuse_remove(struct platform_device *pdev)
-{
-       struct nvmem_device *nvmem = platform_get_drvdata(pdev);
-
-       return nvmem_unregister(nvmem);
+       return PTR_ERR_OR_ZERO(nvmem);
 }
 
 static struct platform_driver rockchip_efuse_driver = {
        .probe = rockchip_efuse_probe,
-       .remove = rockchip_efuse_remove,
        .driver = {
                .name = "rockchip-efuse",
                .of_match_table = rockchip_efuse_match,