提交 2f3b4342 编写于 作者: K Karol Lewandowski 提交者: Anton Vorontsov

max17042_battery: Use devm_kzalloc() where applicable

This allows us to simplify probe and exit function.
Signed-off-by: NKarol Lewandowski <k.lewandowsk@samsung.com>
Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: NAnton Vorontsov <anton.vorontsov@linaro.org>
上级 13e0aa46
......@@ -619,7 +619,7 @@ static int __devinit max17042_probe(struct i2c_client *client,
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA))
return -EIO;
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip)
return -ENOMEM;
......@@ -676,10 +676,8 @@ static int __devinit max17042_probe(struct i2c_client *client,
}
ret = power_supply_register(&client->dev, &chip->battery);
if (ret) {
if (ret)
dev_err(&client->dev, "failed: power supply register\n");
kfree(chip);
}
return ret;
}
......@@ -688,7 +686,6 @@ static int __devexit max17042_remove(struct i2c_client *client)
struct max17042_chip *chip = i2c_get_clientdata(client);
power_supply_unregister(&chip->battery);
kfree(chip);
return 0;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册