提交 50bddb99 编写于 作者: V Vaishali Thakkar 提交者: Sebastian Reichel

power: max17042_battery: Convert to using managed resources

Use managed resource functions devm_request_threaded_irq and
devm_power_supply_register to simplify error handling.

Also, remove max17042_remove as it is now redundant.
Signed-off-by: NVaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: NSebastian Reichel <sre@kernel.org>
上级 bc312cbd
...@@ -909,18 +909,21 @@ static int max17042_probe(struct i2c_client *client, ...@@ -909,18 +909,21 @@ static int max17042_probe(struct i2c_client *client,
regmap_write(chip->regmap, MAX17042_LearnCFG, 0x0007); regmap_write(chip->regmap, MAX17042_LearnCFG, 0x0007);
} }
chip->battery = power_supply_register(&client->dev, max17042_desc, chip->battery = devm_power_supply_register(&client->dev, max17042_desc,
&psy_cfg); &psy_cfg);
if (IS_ERR(chip->battery)) { if (IS_ERR(chip->battery)) {
dev_err(&client->dev, "failed: power supply register\n"); dev_err(&client->dev, "failed: power supply register\n");
return PTR_ERR(chip->battery); return PTR_ERR(chip->battery);
} }
if (client->irq) { if (client->irq) {
ret = request_threaded_irq(client->irq, NULL, ret = devm_request_threaded_irq(&client->dev, client->irq,
max17042_thread_handler, NULL,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT, max17042_thread_handler,
chip->battery->desc->name, chip); IRQF_TRIGGER_FALLING |
IRQF_ONESHOT,
chip->battery->desc->name,
chip);
if (!ret) { if (!ret) {
regmap_update_bits(chip->regmap, MAX17042_CONFIG, regmap_update_bits(chip->regmap, MAX17042_CONFIG,
CONFIG_ALRT_BIT_ENBL, CONFIG_ALRT_BIT_ENBL,
...@@ -944,16 +947,6 @@ static int max17042_probe(struct i2c_client *client, ...@@ -944,16 +947,6 @@ static int max17042_probe(struct i2c_client *client,
return 0; return 0;
} }
static int max17042_remove(struct i2c_client *client)
{
struct max17042_chip *chip = i2c_get_clientdata(client);
if (client->irq)
free_irq(client->irq, chip);
power_supply_unregister(chip->battery);
return 0;
}
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int max17042_suspend(struct device *dev) static int max17042_suspend(struct device *dev)
{ {
...@@ -1014,7 +1007,6 @@ static struct i2c_driver max17042_i2c_driver = { ...@@ -1014,7 +1007,6 @@ static struct i2c_driver max17042_i2c_driver = {
.pm = &max17042_pm_ops, .pm = &max17042_pm_ops,
}, },
.probe = max17042_probe, .probe = max17042_probe,
.remove = max17042_remove,
.id_table = max17042_id, .id_table = max17042_id,
}; };
module_i2c_driver(max17042_i2c_driver); module_i2c_driver(max17042_i2c_driver);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册