[PATCH 14/20] nvmem: bcm-ocotp: Convert to use devm_nvmem_register()

[Andrey Smirnov]

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

Cc: Srinivas Kandagatla 
Cc: Heiko Stuebner 
Cc: Masahiro Yamada 
Cc: Carlo Caione 
Cc: Kevin Hilman 
Cc: Matthias Brugger 
Cc: Joachim Eastwood 
Cc: cphe...@gmail.com
Cc: linux-kernel@vger.kernel.org
Cc: linux-media...@lists.infradead.org
Cc: linux-rockc...@lists.infradead.org
Cc: linux-amlo...@lists.infradead.org
Cc: linux-arm-ker...@lists.infradead.org
Signed-off-by: Andrey Smirnov 
---
 drivers/nvmem/bcm-ocotp.c | 12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/nvmem/bcm-ocotp.c b/drivers/nvmem/bcm-ocotp.c
index 5e9e324427f9..24c30fa475cc 100644
--- a/drivers/nvmem/bcm-ocotp.c
+++ b/drivers/nvmem/bcm-ocotp.c
@@ -302,27 +302,17 @@ static int bcm_otpc_probe(struct platform_device *pdev)
 
priv->config = _otpc_nvmem_config;
 
-   nvmem = nvmem_register(_otpc_nvmem_config);
+   nvmem = devm_nvmem_register(dev, _otpc_nvmem_config);
if (IS_ERR(nvmem)) {
dev_err(dev, "error registering nvmem config\n");
return PTR_ERR(nvmem);
}
 
-   platform_set_drvdata(pdev, nvmem);
-
return 0;
 }
 
-static int bcm_otpc_remove(struct platform_device *pdev)
-{
-   struct nvmem_device *nvmem = platform_get_drvdata(pdev);
-
-   return nvmem_unregister(nvmem);
-}
-
 static struct platform_driver bcm_otpc_driver = {
.probe  = bcm_otpc_probe,
-   .remove = bcm_otpc_remove,
.driver = {
.name   = "brcm-otpc",
.of_match_table = bcm_otpc_dt_ids,
-- 
2.14.3

[PATCH 14/20] nvmem: bcm-ocotp: Convert to use devm_nvmem_register()

[Andrey Smirnov]

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

Cc: Srinivas Kandagatla 
Cc: Heiko Stuebner 
Cc: Masahiro Yamada 
Cc: Carlo Caione 
Cc: Kevin Hilman 
Cc: Matthias Brugger 
Cc: Joachim Eastwood 
Cc: cphe...@gmail.com
Cc: linux-kernel@vger.kernel.org
Cc: linux-media...@lists.infradead.org
Cc: linux-rockc...@lists.infradead.org
Cc: linux-amlo...@lists.infradead.org
Cc: linux-arm-ker...@lists.infradead.org
Signed-off-by: Andrey Smirnov 
---
 drivers/nvmem/bcm-ocotp.c | 12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/nvmem/bcm-ocotp.c b/drivers/nvmem/bcm-ocotp.c
index 5e9e324427f9..24c30fa475cc 100644
--- a/drivers/nvmem/bcm-ocotp.c
+++ b/drivers/nvmem/bcm-ocotp.c
@@ -302,27 +302,17 @@ static int bcm_otpc_probe(struct platform_device *pdev)
 
priv->config = _otpc_nvmem_config;
 
-   nvmem = nvmem_register(_otpc_nvmem_config);
+   nvmem = devm_nvmem_register(dev, _otpc_nvmem_config);
if (IS_ERR(nvmem)) {
dev_err(dev, "error registering nvmem config\n");
return PTR_ERR(nvmem);
}
 
-   platform_set_drvdata(pdev, nvmem);
-
return 0;
 }
 
-static int bcm_otpc_remove(struct platform_device *pdev)
-{
-   struct nvmem_device *nvmem = platform_get_drvdata(pdev);
-
-   return nvmem_unregister(nvmem);
-}
-
 static struct platform_driver bcm_otpc_driver = {
.probe  = bcm_otpc_probe,
-   .remove = bcm_otpc_remove,
.driver = {
.name   = "brcm-otpc",
.of_match_table = bcm_otpc_dt_ids,
-- 
2.14.3