Skip to content

Commit

Permalink
nvmem: sc27xx: Change to use devm_hwspin_lock_request_specific() to r…
Browse files Browse the repository at this point in the history
…equest 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 <[email protected]>
Signed-off-by: Srinivas Kandagatla <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
wangbaolin719 authored and gregkh committed Nov 5, 2019
1 parent 9b8303f commit 1e6d8e5
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions drivers/nvmem/sc27xx-efuse.c
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,14 @@ 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;
}

mutex_init(&efuse->mutex);
efuse->dev = &pdev->dev;
platform_set_drvdata(pdev, efuse);

econfig.stride = 1;
econfig.word_size = 1;
Expand All @@ -232,29 +231,19 @@ 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" },
{ }
};

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,
Expand Down

0 comments on commit 1e6d8e5

Please sign in to comment.