Commit d284feaf authored Jul 08, 2019 by Fuqian Huang Committed by Jonathan Cameron Jul 27, 2019

iio: imu: mpu6050: Replace devm_add_action() followed by failure action with...

iio: imu: mpu6050: Replace devm_add_action() followed by failure action with devm_add_action_or_reset()

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>

parent 46916ded

drivers/iio/imu/inv_mpu6050/inv_mpu_core.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;

Admin message