summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2018-03-09 09:47:03 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-14 14:28:13 -0400
commit7e68a6454636bec29e6acc56e910282d81c4023d (patch)
tree4cef5248abd8b2c7fcb4d8d6b7f5da3093e180f4
parentf4bec713938afe763494e350ea6e0f81dff9d229 (diff)
nvmem: mtk-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>
-rw-r--r--drivers/nvmem/mtk-efuse.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/nvmem/mtk-efuse.c b/drivers/nvmem/mtk-efuse.c
index 9ee3479cfc7b..e66adf17a747 100644
--- a/drivers/nvmem/mtk-efuse.c
+++ b/drivers/nvmem/mtk-efuse.c
@@ -72,20 +72,9 @@ static int mtk_efuse_probe(struct platform_device *pdev)
72 econfig.size = resource_size(res); 72 econfig.size = resource_size(res);
73 econfig.priv = priv; 73 econfig.priv = priv;
74 econfig.dev = dev; 74 econfig.dev = dev;
75 nvmem = nvmem_register(&econfig); 75 nvmem = devm_nvmem_register(dev, &econfig);
76 if (IS_ERR(nvmem))
77 return PTR_ERR(nvmem);
78 76
79 platform_set_drvdata(pdev, nvmem); 77 return PTR_ERR_OR_ZERO(nvmem);
80
81 return 0;
82}
83
84static int mtk_efuse_remove(struct platform_device *pdev)
85{
86 struct nvmem_device *nvmem = platform_get_drvdata(pdev);
87
88 return nvmem_unregister(nvmem);
89} 78}
90 79
91static const struct of_device_id mtk_efuse_of_match[] = { 80static const struct of_device_id mtk_efuse_of_match[] = {
@@ -97,7 +86,6 @@ MODULE_DEVICE_TABLE(of, mtk_efuse_of_match);
97 86
98static struct platform_driver mtk_efuse_driver = { 87static struct platform_driver mtk_efuse_driver = {
99 .probe = mtk_efuse_probe, 88 .probe = mtk_efuse_probe,
100 .remove = mtk_efuse_remove,
101 .driver = { 89 .driver = {
102 .name = "mediatek,efuse", 90 .name = "mediatek,efuse",
103 .of_match_table = mtk_efuse_of_match, 91 .of_match_table = mtk_efuse_of_match,