forked from Minki/linux
regulator: rc5t583: Use devm_regulator_register
devm_* simplifies the code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
parent
51c86b3eb8
commit
1377530910
|
@ -173,33 +173,16 @@ skip_ext_pwr_config:
|
||||||
config.driver_data = reg;
|
config.driver_data = reg;
|
||||||
config.regmap = rc5t583->regmap;
|
config.regmap = rc5t583->regmap;
|
||||||
|
|
||||||
rdev = regulator_register(&ri->desc, &config);
|
rdev = devm_regulator_register(&pdev->dev, &ri->desc, &config);
|
||||||
if (IS_ERR(rdev)) {
|
if (IS_ERR(rdev)) {
|
||||||
dev_err(&pdev->dev, "Failed to register regulator %s\n",
|
dev_err(&pdev->dev, "Failed to register regulator %s\n",
|
||||||
ri->desc.name);
|
ri->desc.name);
|
||||||
ret = PTR_ERR(rdev);
|
return PTR_ERR(rdev);
|
||||||
goto clean_exit;
|
|
||||||
}
|
}
|
||||||
reg->rdev = rdev;
|
reg->rdev = rdev;
|
||||||
}
|
}
|
||||||
platform_set_drvdata(pdev, regs);
|
platform_set_drvdata(pdev, regs);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
clean_exit:
|
|
||||||
while (--id >= 0)
|
|
||||||
regulator_unregister(regs[id].rdev);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int rc5t583_regulator_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
struct rc5t583_regulator *regs = platform_get_drvdata(pdev);
|
|
||||||
int id;
|
|
||||||
|
|
||||||
for (id = 0; id < RC5T583_REGULATOR_MAX; ++id)
|
|
||||||
regulator_unregister(regs[id].rdev);
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct platform_driver rc5t583_regulator_driver = {
|
static struct platform_driver rc5t583_regulator_driver = {
|
||||||
|
@ -208,7 +191,6 @@ static struct platform_driver rc5t583_regulator_driver = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
},
|
},
|
||||||
.probe = rc5t583_regulator_probe,
|
.probe = rc5t583_regulator_probe,
|
||||||
.remove = rc5t583_regulator_remove,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __init rc5t583_regulator_init(void)
|
static int __init rc5t583_regulator_init(void)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user