* [PATCH] Input: mpr121 - Make use of the helper function devm_add_action_or_reset()
@ 2021-09-22 12:59 Cai Huoqing
2021-09-23 4:55 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Cai Huoqing @ 2021-09-22 12:59 UTC (permalink / raw)
To: caihuoqing; +Cc: Dmitry Torokhov, linux-input, linux-kernel
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>
---
drivers/input/keyboard/mpr121_touchkey.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/input/keyboard/mpr121_touchkey.c b/drivers/input/keyboard/mpr121_touchkey.c
index 40d6e5087cde..a23f832d4b44 100644
--- a/drivers/input/keyboard/mpr121_touchkey.c
+++ b/drivers/input/keyboard/mpr121_touchkey.c
@@ -107,9 +107,8 @@ 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);
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Input: mpr121 - Make use of the helper function devm_add_action_or_reset()
2021-09-22 12:59 [PATCH] Input: mpr121 - Make use of the helper function devm_add_action_or_reset() Cai Huoqing
@ 2021-09-23 4:55 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2021-09-23 4:55 UTC (permalink / raw)
To: Cai Huoqing; +Cc: linux-input, linux-kernel
On Wed, Sep 22, 2021 at 08:59:54PM +0800, Cai Huoqing wrote:
> 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>
Applied, thank you.
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-09-23 4:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-22 12:59 [PATCH] Input: mpr121 - Make use of the helper function devm_add_action_or_reset() Cai Huoqing
2021-09-23 4:55 ` Dmitry Torokhov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.