summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorCai Huoqing <caihuoqing@baidu.com>2021-09-22 21:39:42 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2021-09-22 21:56:47 -0700
commitb083704fbf6cea21a187a99f6dae20fbca86b44e (patch)
treef99a37e518f31a128976748a4082d44fe9abb0f0 /drivers/input
parent09182ed20c04d1b3a3a0d232d7748e745a438acd (diff)
downloadlinux-b083704fbf6cea21a187a99f6dae20fbca86b44e.tar.bz2
Input: elants_i2c - make use of 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/20210922125212.95-2-caihuoqing@baidu.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/elants_i2c.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
index 17540bdb1eaf..98ba5cab685b 100644
--- a/drivers/input/touchscreen/elants_i2c.c
+++ b/drivers/input/touchscreen/elants_i2c.c
@@ -1440,11 +1440,11 @@ static int elants_i2c_probe(struct i2c_client *client,
if (error)
return error;
- error = devm_add_action(&client->dev, elants_i2c_power_off, ts);
+ error = devm_add_action_or_reset(&client->dev,
+ elants_i2c_power_off, ts);
if (error) {
dev_err(&client->dev,
"failed to install power off action: %d\n", error);
- elants_i2c_power_off(ts);
return error;
}