From: Cai Huoqing Date: Thu, 23 Sep 2021 04:39:42 +0000 (-0700) Subject: Input: elants_i2c - make use of devm_add_action_or_reset() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b083704fbf6cea21a187a99f6dae20fbca86b44e;p=linux.git 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 Link: https://lore.kernel.org/r/20210922125212.95-2-caihuoqing@baidu.com Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c index 17540bdb1eaf7..98ba5cab685bc 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; }