Input: mpr121 - make use of the helper function devm_add_action_or_reset()
The helper function devm_add_action_or_reset() will internally call devm_add_action(), and if devm_add_action() fails then it will execute the action mentioned and return the error code. So use devm_add_action_or_reset() instead of devm_add_action() to simplify the error handling, reduce the code. Signed-off-by: Cai Huoqing <caihuoqing@baidu.com> Link: https://lore.kernel.org/r/20210922125954.533-1-caihuoqing@baidu.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Родитель
4b3ed1ae28
Коммит
d5af8a8f7c
|
@ -107,9 +107,9 @@ static struct regulator *mpr121_vdd_supply_init(struct device *dev)
|
|||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
err = devm_add_action(dev, mpr121_vdd_supply_disable, vdd_supply);
|
||||
err = devm_add_action_or_reset(dev, mpr121_vdd_supply_disable,
|
||||
vdd_supply);
|
||||
if (err) {
|
||||
regulator_disable(vdd_supply);
|
||||
dev_err(dev, "failed to add disable regulator action: %d\n",
|
||||
err);
|
||||
return ERR_PTR(err);
|
||||
|
|
Загрузка…
Ссылка в новой задаче