nvmem: meson-efuse: Convert to use devm_nvmem_register()
authorAndrey Smirnov <andrew.smirnov@gmail.com>
Fri, 9 Mar 2018 14:47:05 +0000 (14:47 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Mar 2018 18:28:14 +0000 (19:28 +0100)
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>
drivers/nvmem/meson-efuse.c

index a43c68f..71823d1 100644 (file)
@@ -60,25 +60,13 @@ static int meson_efuse_probe(struct platform_device *pdev)
        econfig.reg_read = meson_efuse_read;
        econfig.size = size;
 
-       nvmem = nvmem_register(&econfig);
-       if (IS_ERR(nvmem))
-               return PTR_ERR(nvmem);
+       nvmem = devm_nvmem_register(&pdev->dev, &econfig);
 
-       platform_set_drvdata(pdev, nvmem);
-
-       return 0;
-}
-
-static int meson_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 meson_efuse_driver = {
        .probe = meson_efuse_probe,
-       .remove = meson_efuse_remove,
        .driver = {
                .name = "meson-efuse",
                .of_match_table = meson_efuse_match,