]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Input: raydium_i2c_ts - make use of the helper function devm_add_action_or_reset()
authorCai Huoqing <caihuoqing@baidu.com>
Thu, 23 Sep 2021 04:49:14 +0000 (21:49 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 23 Sep 2021 04:56:49 +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/20210922125212.95-3-caihuoqing@baidu.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/raydium_i2c_ts.c

index 92c48d8e35a41efd29b679562646aa691e874788..3a4952935366f91b157bf0b7350f366248ab49c8 100644 (file)
@@ -1118,11 +1118,11 @@ static int raydium_i2c_probe(struct i2c_client *client,
        if (error)
                return error;
 
-       error = devm_add_action(&client->dev, raydium_i2c_power_off, ts);
+       error = devm_add_action_or_reset(&client->dev,
+                                        raydium_i2c_power_off, ts);
        if (error) {
                dev_err(&client->dev,
                        "failed to install power off action: %d\n", error);
-               raydium_i2c_power_off(ts);
                return error;
        }