Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-08 15:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Baolin Wang 2019-10-29 11:42:32 +00:00 committed by Greg Kroah-Hartman
parent 9b8303fc6e
commit 1e6d8e5f44
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/nvmem/sc27xx-efuse.c
View File

@ -211,7 +211,7 @@ static int sc27xx_efuse_probe(struct platform_device *pdev)
return ret; return ret;
} }
efuse->hwlock = hwspin_lock_request_specific(ret); efuse->hwlock = devm_hwspin_lock_request_specific(&pdev->dev, ret);
if (!efuse->hwlock) { if (!efuse->hwlock) {
dev_err(&pdev->dev, "failed to request hwspinlock\n"); dev_err(&pdev->dev, "failed to request hwspinlock\n");
return -ENXIO; return -ENXIO;
@ -219,7 +219,6 @@ static int sc27xx_efuse_probe(struct platform_device *pdev)
mutex_init(&efuse->mutex); mutex_init(&efuse->mutex);
efuse->dev = &pdev->dev; efuse->dev = &pdev->dev;
platform_set_drvdata(pdev, efuse);
econfig.stride = 1; econfig.stride = 1;
econfig.word_size = 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); nvmem = devm_nvmem_register(&pdev->dev, &econfig);
if (IS_ERR(nvmem)) { if (IS_ERR(nvmem)) {
dev_err(&pdev->dev, "failed to register nvmem config\n"); dev_err(&pdev->dev, "failed to register nvmem config\n");
hwspin_lock_free(efuse->hwlock);
return PTR_ERR(nvmem); return PTR_ERR(nvmem);
} }
return 0; 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[] = { static const struct of_device_id sc27xx_efuse_of_match[] = {
{ .compatible = "sprd,sc2731-efuse" }, { .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 = { static struct platform_driver sc27xx_efuse_driver = {
.probe = sc27xx_efuse_probe, .probe = sc27xx_efuse_probe,
.remove = sc27xx_efuse_remove,
.driver = { .driver = {
.name = "sc27xx-efuse", .name = "sc27xx-efuse",
.of_match_table = sc27xx_efuse_of_match, .of_match_table = sc27xx_efuse_of_match,