Skip to content

Commit

Permalink
lp8727_charger: Use devm_kzalloc()
Browse files Browse the repository at this point in the history
Use devm_kzalloc() rather than kzalloc()/kfree() to make
allocating/freeing the private data simpler.

Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
  • Loading branch information
Kim, Milo authored and Anton Vorontsov committed Sep 21, 2012
1 parent a2778b0 commit 74727c5
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/power/lp8727_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ static int lp8727_register_psy(struct lp8727_chg *pchg)
{
struct lp8727_psy *psy;

psy = kzalloc(sizeof(*psy), GFP_KERNEL);
psy = devm_kzalloc(pchg->dev, sizeof(*psy), GFP_KERNEL);
if (!psy)
return -ENOMEM;

Expand Down Expand Up @@ -405,7 +405,6 @@ static int lp8727_register_psy(struct lp8727_chg *pchg)
err_psy_usb:
power_supply_unregister(&psy->ac);
err_psy_ac:
kfree(psy);
return -EPERM;
}

Expand All @@ -419,7 +418,6 @@ static void lp8727_unregister_psy(struct lp8727_chg *pchg)
power_supply_unregister(&psy->ac);
power_supply_unregister(&psy->usb);
power_supply_unregister(&psy->batt);
kfree(psy);
}

static int lp8727_probe(struct i2c_client *cl, const struct i2c_device_id *id)
Expand All @@ -430,7 +428,7 @@ static int lp8727_probe(struct i2c_client *cl, const struct i2c_device_id *id)
if (!i2c_check_functionality(cl->adapter, I2C_FUNC_SMBUS_I2C_BLOCK))
return -EIO;

pchg = kzalloc(sizeof(*pchg), GFP_KERNEL);
pchg = devm_kzalloc(&cl->dev, sizeof(*pchg), GFP_KERNEL);
if (!pchg)
return -ENOMEM;

Expand Down Expand Up @@ -462,7 +460,6 @@ static int lp8727_probe(struct i2c_client *cl, const struct i2c_device_id *id)
return 0;

error:
kfree(pchg);
return ret;
}

Expand All @@ -474,7 +471,6 @@ static int __devexit lp8727_remove(struct i2c_client *cl)
free_irq(pchg->client->irq, pchg);
flush_workqueue(pchg->irqthread);
destroy_workqueue(pchg->irqthread);
kfree(pchg);
return 0;
}

Expand Down

0 comments on commit 74727c5

Please sign in to comment.