Merge tag 'edac_for_4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

[linux-2.6-microblaze.git] / drivers / nvmem / meson-mx-efuse.c

diff --git a/drivers/nvmem/meson-mx-efuse.c b/drivers/nvmem/meson-mx-efuse.c
index 41d3a3c..a085563 100644 (file)
--- a/drivers/nvmem/meson-mx-efuse.c
+++ b/drivers/nvmem/meson-mx-efuse.c
@@ -233,25 +233,13 @@ static int meson_mx_efuse_probe(struct platform_device *pdev)
                return PTR_ERR(efuse->core_clk);
        }
 
-       efuse->nvmem = nvmem_register(&efuse->config);
-       if (IS_ERR(efuse->nvmem))
-               return PTR_ERR(efuse->nvmem);
+       efuse->nvmem = devm_nvmem_register(&pdev->dev, &efuse->config);
 
-       platform_set_drvdata(pdev, efuse);
-
-       return 0;
-}
-
-static int meson_mx_efuse_remove(struct platform_device *pdev)
-{
-       struct meson_mx_efuse *efuse = platform_get_drvdata(pdev);
-
-       return nvmem_unregister(efuse->nvmem);
+       return PTR_ERR_OR_ZERO(efuse->nvmem);
 }
 
 static struct platform_driver meson_mx_efuse_driver = {
        .probe = meson_mx_efuse_probe,
-       .remove = meson_mx_efuse_remove,
        .driver = {
                .name = "meson-mx-efuse",
                .of_match_table = meson_mx_efuse_match,