mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-25 17:40:54 +07:00
regulator: tps80031: Use devm_regulator_register
devm_* simplifies the code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
parent
ab1d65e03a
commit
0fb0c82e81
@ -719,7 +719,7 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev,
|
||||
"regulator config failed, e %d\n", ret);
|
||||
goto fail;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = tps80031_power_req_config(pdev->dev.parent,
|
||||
@ -727,41 +727,22 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev,
|
||||
"pwr_req config failed, err %d\n", ret);
|
||||
goto fail;
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
rdev = regulator_register(&ri->rinfo->desc, &config);
|
||||
rdev = devm_regulator_register(&pdev->dev, &ri->rinfo->desc,
|
||||
&config);
|
||||
if (IS_ERR(rdev)) {
|
||||
dev_err(&pdev->dev,
|
||||
"register regulator failed %s\n",
|
||||
ri->rinfo->desc.name);
|
||||
ret = PTR_ERR(rdev);
|
||||
goto fail;
|
||||
return PTR_ERR(rdev);
|
||||
}
|
||||
ri->rdev = rdev;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, pmic);
|
||||
return 0;
|
||||
fail:
|
||||
while (--num >= 0) {
|
||||
ri = &pmic[num];
|
||||
regulator_unregister(ri->rdev);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int tps80031_regulator_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct tps80031_regulator *pmic = platform_get_drvdata(pdev);
|
||||
struct tps80031_regulator *ri = NULL;
|
||||
int num;
|
||||
|
||||
for (num = 0; num < TPS80031_REGULATOR_MAX; ++num) {
|
||||
ri = &pmic[num];
|
||||
regulator_unregister(ri->rdev);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver tps80031_regulator_driver = {
|
||||
@ -770,7 +751,6 @@ static struct platform_driver tps80031_regulator_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = tps80031_regulator_probe,
|
||||
.remove = tps80031_regulator_remove,
|
||||
};
|
||||
|
||||
static int __init tps80031_regulator_init(void)
|
||||
|
Loading…
Reference in New Issue
Block a user