iio: imu: mpu6050: Replace devm_add_action() followed by failure action with devm_add...
authorFuqian Huang <huangfq.daxian@gmail.com>
Mon, 8 Jul 2019 12:33:41 +0000 (20:33 +0800)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 27 Jul 2019 19:11:14 +0000 (20:11 +0100)
devm_add_action_or_reset() is introduced as a helper function which
internally calls devm_add_action(). If devm_add_action() fails
then it will execute the action mentioned and return the error code.
This reduce source code size (avoid writing the action twice)
and reduce the likelyhood of bugs.

Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c

index 53a59957cc5428d4ae6905b19f958acb8bfa4707..e067927317bd9ec8bf3b90d1b720d96bae4a98b6 100644 (file)
@@ -1096,10 +1096,9 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name,
        if (result)
                return result;
 
-       result = devm_add_action(dev, inv_mpu_core_disable_regulator_action,
+       result = devm_add_action_or_reset(dev, inv_mpu_core_disable_regulator_action,
                                 st);
        if (result) {
-               inv_mpu_core_disable_regulator_action(st);
                dev_err(dev, "Failed to setup regulator cleanup action %d\n",
                        result);
                return result;