mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 15:41:36 +00:00
regulator: max8649: 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
027a27545c
commit
e453f92eec
@ -234,7 +234,8 @@ static int max8649_regulator_probe(struct i2c_client *client,
|
|||||||
config.driver_data = info;
|
config.driver_data = info;
|
||||||
config.regmap = info->regmap;
|
config.regmap = info->regmap;
|
||||||
|
|
||||||
info->regulator = regulator_register(&dcdc_desc, &config);
|
info->regulator = devm_regulator_register(&client->dev, &dcdc_desc,
|
||||||
|
&config);
|
||||||
if (IS_ERR(info->regulator)) {
|
if (IS_ERR(info->regulator)) {
|
||||||
dev_err(info->dev, "failed to register regulator %s\n",
|
dev_err(info->dev, "failed to register regulator %s\n",
|
||||||
dcdc_desc.name);
|
dcdc_desc.name);
|
||||||
@ -244,16 +245,6 @@ static int max8649_regulator_probe(struct i2c_client *client,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int max8649_regulator_remove(struct i2c_client *client)
|
|
||||||
{
|
|
||||||
struct max8649_regulator_info *info = i2c_get_clientdata(client);
|
|
||||||
|
|
||||||
if (info)
|
|
||||||
regulator_unregister(info->regulator);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static const struct i2c_device_id max8649_id[] = {
|
static const struct i2c_device_id max8649_id[] = {
|
||||||
{ "max8649", 0 },
|
{ "max8649", 0 },
|
||||||
{ }
|
{ }
|
||||||
@ -262,7 +253,6 @@ MODULE_DEVICE_TABLE(i2c, max8649_id);
|
|||||||
|
|
||||||
static struct i2c_driver max8649_driver = {
|
static struct i2c_driver max8649_driver = {
|
||||||
.probe = max8649_regulator_probe,
|
.probe = max8649_regulator_probe,
|
||||||
.remove = max8649_regulator_remove,
|
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "max8649",
|
.name = "max8649",
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user