nvmem: sc27xx: Change to use devm_hwspin_lock_request_specific() to request one hwlock

Change to use devm_hwspin_lock_request_specific() to help to simplify the
cleanup code for drivers requesting one hwlock. Thus we can remove the
redundant sc27xx_efuse_remove() and platform_set_drvdata().

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20191029114240.14905-3-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/nvmem/sc27xx-efuse.c b/drivers/nvmem/sc27xx-efuse.c
index c6ee21018d805d4e07bee7725cef3b04d86094e4..ab5e7e0bc3d825abef56782134331c884a438e34 100644 (file)
--- a/drivers/nvmem/sc27xx-efuse.c
+++ b/drivers/nvmem/sc27xx-efuse.c
@@ -211,7 +211,7 @@ static int sc27xx_efuse_probe(struct platform_device *pdev)
                return ret;
        }
 
-       efuse->hwlock = hwspin_lock_request_specific(ret);
+       efuse->hwlock = devm_hwspin_lock_request_specific(&pdev->dev, ret);
        if (!efuse->hwlock) {
                dev_err(&pdev->dev, "failed to request hwspinlock\n");
                return -ENXIO;
@@ -219,7 +219,6 @@ static int sc27xx_efuse_probe(struct platform_device *pdev)
 
        mutex_init(&efuse->mutex);
        efuse->dev = &pdev->dev;
-       platform_set_drvdata(pdev, efuse);
 
        econfig.stride = 1;
        econfig.word_size = 1;
@@ -232,21 +231,12 @@ static int sc27xx_efuse_probe(struct platform_device *pdev)
        nvmem = devm_nvmem_register(&pdev->dev, &econfig);
        if (IS_ERR(nvmem)) {
                dev_err(&pdev->dev, "failed to register nvmem config\n");
-               hwspin_lock_free(efuse->hwlock);
                return PTR_ERR(nvmem);
        }
 
        return 0;
 }
 
-static int sc27xx_efuse_remove(struct platform_device *pdev)
-{
-       struct sc27xx_efuse *efuse = platform_get_drvdata(pdev);
-
-       hwspin_lock_free(efuse->hwlock);
-       return 0;
-}
-
 static const struct of_device_id sc27xx_efuse_of_match[] = {
        { .compatible = "sprd,sc2731-efuse" },
        { }
@@ -254,7 +244,6 @@ static const struct of_device_id sc27xx_efuse_of_match[] = {
 
 static struct platform_driver sc27xx_efuse_driver = {
        .probe = sc27xx_efuse_probe,
-       .remove = sc27xx_efuse_remove,
        .driver = {
                .name = "sc27xx-efuse",
                .of_match_table = sc27xx_efuse_of_match,