On Mon,  8 Jul 2019 20:33:41 +0800
Fuqian Huang <[email protected]> wrote:

> 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 <[email protected]>
Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to see if we missed anything.

Thanks,

Jonathan

> ---
>  drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c 
> b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> index 53a59957cc54..e067927317bd 100644
> --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> @@ -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;

Reply via email to