]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Input: mpr121 - make use of the helper function devm_add_action_or_reset()
authorCai Huoqing <caihuoqing@baidu.com>
Thu, 23 Sep 2021 04:50:49 +0000 (21:50 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 23 Sep 2021 04:56:50 +0000 (21:56 -0700)
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>
drivers/input/keyboard/mpr121_touchkey.c

index 40d6e5087cdef060acce22fdd4aa2a5d082cf230..230ab3d50b9e93627f2245a9bec0d1135ee09586 100644 (file)
@@ -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);