Skip to content

Commit

Permalink
tps65090-charger: Drop devm_free_irq of devm_ allocated irq
Browse files Browse the repository at this point in the history
The devm_request_irq function allocates irq that is released when a driver
detaches. Thus, there is no reason to explicitly call devm_free_irq in
probe or remove functions.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
  • Loading branch information
Wei Yongjun authored and Anton Vorontsov committed Oct 25, 2013
1 parent ce77399 commit 0ed8139
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions drivers/power/tps65090-charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,13 @@ static int tps65090_charger_probe(struct platform_device *pdev)
if (ret) {
dev_err(cdata->dev, "Unable to register irq %d err %d\n", irq,
ret);
goto fail_free_irq;
goto fail_unregister_supply;
}

ret = tps65090_config_charger(cdata);
if (ret < 0) {
dev_err(&pdev->dev, "charger config failed, err %d\n", ret);
goto fail_free_irq;
goto fail_unregister_supply;
}

/* Check for charger presence */
Expand All @@ -292,23 +292,21 @@ static int tps65090_charger_probe(struct platform_device *pdev)
if (ret < 0) {
dev_err(cdata->dev, "%s(): Error in reading reg 0x%x", __func__,
TPS65090_REG_CG_STATUS1);
goto fail_free_irq;
goto fail_unregister_supply;
}

if (status1 != 0) {
ret = tps65090_enable_charging(cdata);
if (ret < 0) {
dev_err(cdata->dev, "error enabling charger\n");
goto fail_free_irq;
goto fail_unregister_supply;
}
cdata->ac_online = 1;
power_supply_changed(&cdata->ac);
}

return 0;

fail_free_irq:
devm_free_irq(cdata->dev, irq, cdata);
fail_unregister_supply:
power_supply_unregister(&cdata->ac);

Expand All @@ -319,7 +317,6 @@ static int tps65090_charger_remove(struct platform_device *pdev)
{
struct tps65090_charger *cdata = platform_get_drvdata(pdev);

devm_free_irq(cdata->dev, cdata->irq, cdata);
power_supply_unregister(&cdata->ac);

return 0;
Expand Down

0 comments on commit 0ed8139

Please sign in to comment.