]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
nvmem: snvs_lgpr: Convert to use devm_nvmem_register()
authorAndrey Smirnov <andrew.smirnov@gmail.com>
Fri, 9 Mar 2018 14:47:01 +0000 (14:47 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Mar 2018 18:28:13 +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/snvs_lpgpr.c

index e5c2a4a17f03db668fdfa65677949c428beae539..cb471d5e8e86f1032e2129b98f1960b9979962fb 100644 (file)
@@ -117,20 +117,9 @@ static int snvs_lpgpr_probe(struct platform_device *pdev)
        cfg->reg_read  = snvs_lpgpr_read,
        cfg->reg_write = snvs_lpgpr_write,
 
-       nvmem = nvmem_register(cfg);
-       if (IS_ERR(nvmem))
-               return PTR_ERR(nvmem);
+       nvmem = devm_nvmem_register(dev, cfg);
 
-       platform_set_drvdata(pdev, nvmem);
-
-       return 0;
-}
-
-static int snvs_lpgpr_remove(struct platform_device *pdev)
-{
-       struct nvmem_device *nvmem = platform_get_drvdata(pdev);
-
-       return nvmem_unregister(nvmem);
+       return PTR_ERR_OR_ZERO(nvmem);
 }
 
 static const struct of_device_id snvs_lpgpr_dt_ids[] = {
@@ -143,7 +132,6 @@ MODULE_DEVICE_TABLE(of, snvs_lpgpr_dt_ids);
 
 static struct platform_driver snvs_lpgpr_driver = {
        .probe  = snvs_lpgpr_probe,
-       .remove = snvs_lpgpr_remove,
        .driver = {
                .name   = "snvs_lpgpr",
                .of_match_table = snvs_lpgpr_dt_ids,