Merge tag 'xtensa-20181115' of git://github.com/jcmvbkbc/linux-xtensa

[linux.git] / drivers / nvmem / bcm-ocotp.c

diff --git a/drivers/nvmem/bcm-ocotp.c b/drivers/nvmem/bcm-ocotp.c
index 5e9e324427f9186ceea6d16e33116bb9d919cf21..4159b3f41d7933a72514add98dd0e1eb935a5748 100644 (file)
--- a/drivers/nvmem/bcm-ocotp.c
+++ b/drivers/nvmem/bcm-ocotp.c
@@ -262,8 +262,7 @@ static int bcm_otpc_probe(struct platform_device *pdev)
        else if (of_device_is_compatible(dev->of_node, "brcm,ocotp-v2"))
                priv->map = &otp_map_v2;
        else {
-               dev_err(&pdev->dev,
-                       "%s otpc config map not defined\n", __func__);
+               dev_err(dev, "%s otpc config map not defined\n", __func__);
                return -EINVAL;
        }
 
@@ -302,27 +301,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,