nvmem: bcm-ocotp: 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/bcm-ocotp.c b/drivers/nvmem/bcm-ocotp.c
index 5e9e324427f9186ceea6d16e33116bb9d919cf21..24c30fa475cc7e8565ef8cf8c488dac0f2affe7f 100644 (file)
--- 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 = &bcm_otpc_nvmem_config;
 
-       nvmem = nvmem_register(&bcm_otpc_nvmem_config);
+       nvmem = devm_nvmem_register(dev, &bcm_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,