nvmem: meson-mx-efuse: Convert to use devm_nvmem_register()

Drop all of the code related to .remove hook and make use of
devm_nvmem_register() instead.

Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: cphealy@gmail.com
Cc: linux-kernel@vger.kernel.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
Cc: linux-amlogic@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/nvmem/meson-mx-efuse.c b/drivers/nvmem/meson-mx-efuse.c
index 41d3a3c1104ec7f810c7f9c33a2cab414c475299..a085563e39e3bfc9240c4fb25e0e6db89a2e6273 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,