88pm860x_battery: Convert to using managed resources
Use managed resource functions devm_request_threaded_irq and devm_power_supply_register to simplify error handling. To be compatible with the change, various gotos are replaced with direct returns and unneeded labels are dropped. Also, remove pm860x_battery_remove as it is now redundant. Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com> Signed-off-by: Sebastian Reichel <sre@kernel.org>
This commit is contained in:
parent
56d7df8716
commit
2a9123f185
|
@ -954,46 +954,32 @@ static int pm860x_battery_probe(struct platform_device *pdev)
|
||||||
else
|
else
|
||||||
info->resistor = 300; /* set default internal resistor */
|
info->resistor = 300; /* set default internal resistor */
|
||||||
|
|
||||||
info->battery = power_supply_register(&pdev->dev, &pm860x_battery_desc,
|
info->battery = devm_power_supply_register(&pdev->dev,
|
||||||
NULL);
|
&pm860x_battery_desc,
|
||||||
|
NULL);
|
||||||
if (IS_ERR(info->battery))
|
if (IS_ERR(info->battery))
|
||||||
return PTR_ERR(info->battery);
|
return PTR_ERR(info->battery);
|
||||||
info->battery->dev.parent = &pdev->dev;
|
info->battery->dev.parent = &pdev->dev;
|
||||||
|
|
||||||
ret = request_threaded_irq(info->irq_cc, NULL,
|
ret = devm_request_threaded_irq(chip->dev, info->irq_cc, NULL,
|
||||||
pm860x_coulomb_handler, IRQF_ONESHOT,
|
pm860x_coulomb_handler, IRQF_ONESHOT,
|
||||||
"coulomb", info);
|
"coulomb", info);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
|
dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
|
||||||
info->irq_cc, ret);
|
info->irq_cc, ret);
|
||||||
goto out_reg;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = request_threaded_irq(info->irq_batt, NULL, pm860x_batt_handler,
|
ret = devm_request_threaded_irq(chip->dev, info->irq_batt, NULL,
|
||||||
IRQF_ONESHOT, "battery", info);
|
pm860x_batt_handler,
|
||||||
|
IRQF_ONESHOT, "battery", info);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
|
dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
|
||||||
info->irq_batt, ret);
|
info->irq_batt, ret);
|
||||||
goto out_coulomb;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
out_coulomb:
|
|
||||||
free_irq(info->irq_cc, info);
|
|
||||||
out_reg:
|
|
||||||
power_supply_unregister(info->battery);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int pm860x_battery_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
struct pm860x_battery_info *info = platform_get_drvdata(pdev);
|
|
||||||
|
|
||||||
free_irq(info->irq_batt, info);
|
|
||||||
free_irq(info->irq_cc, info);
|
|
||||||
power_supply_unregister(info->battery);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1028,7 +1014,6 @@ static struct platform_driver pm860x_battery_driver = {
|
||||||
.pm = &pm860x_battery_pm_ops,
|
.pm = &pm860x_battery_pm_ops,
|
||||||
},
|
},
|
||||||
.probe = pm860x_battery_probe,
|
.probe = pm860x_battery_probe,
|
||||||
.remove = pm860x_battery_remove,
|
|
||||||
};
|
};
|
||||||
module_platform_driver(pm860x_battery_driver);
|
module_platform_driver(pm860x_battery_driver);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue