diff mbox series

[04/14] power: supply: sc27xx: Replace devm_add_action() followed by failure action with devm_add_action_or_reset()

Message ID 20190708123259.11805-1-huangfq.daxian@gmail.com (mailing list archive)
State Not Applicable, archived
Headers show
Series None | expand

Commit Message

Fuqian Huang July 8, 2019, 12:32 p.m. UTC
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>
---
 drivers/power/supply/sc27xx_fuel_gauge.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

(Exiting) Baolin Wang July 9, 2019, 5:44 a.m. UTC | #1
Hi Fuqian,

On Mon, 8 Jul 2019 at 20:33, Fuqian Huang <huangfq.daxian@gmail.com> 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 <huangfq.daxian@gmail.com>

Looks good to me. Thanks.
Reviewed-by: Baolin Wang <baolin.wang@linaro.org>

> ---
>  drivers/power/supply/sc27xx_fuel_gauge.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/power/supply/sc27xx_fuel_gauge.c b/drivers/power/supply/sc27xx_fuel_gauge.c
> index 9c184d80088b..58b2970cd359 100644
> --- a/drivers/power/supply/sc27xx_fuel_gauge.c
> +++ b/drivers/power/supply/sc27xx_fuel_gauge.c
> @@ -1023,9 +1023,8 @@ static int sc27xx_fgu_probe(struct platform_device *pdev)
>                 return ret;
>         }
>
> -       ret = devm_add_action(dev, sc27xx_fgu_disable, data);
> +       ret = devm_add_action_or_reset(dev, sc27xx_fgu_disable, data);
>         if (ret) {
> -               sc27xx_fgu_disable(data);
>                 dev_err(dev, "failed to add fgu disable action\n");
>                 return ret;
>         }
> --
> 2.11.0
>
Sebastian Reichel Sept. 2, 2019, 7:10 p.m. UTC | #2
Hi,

On Mon, Jul 08, 2019 at 08:32:59PM +0800, Fuqian Huang 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 <huangfq.daxian@gmail.com>
> ---

Thanks, queued.

-- Sebastian

>  drivers/power/supply/sc27xx_fuel_gauge.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/power/supply/sc27xx_fuel_gauge.c b/drivers/power/supply/sc27xx_fuel_gauge.c
> index 9c184d80088b..58b2970cd359 100644
> --- a/drivers/power/supply/sc27xx_fuel_gauge.c
> +++ b/drivers/power/supply/sc27xx_fuel_gauge.c
> @@ -1023,9 +1023,8 @@ static int sc27xx_fgu_probe(struct platform_device *pdev)
>  		return ret;
>  	}
>  
> -	ret = devm_add_action(dev, sc27xx_fgu_disable, data);
> +	ret = devm_add_action_or_reset(dev, sc27xx_fgu_disable, data);
>  	if (ret) {
> -		sc27xx_fgu_disable(data);
>  		dev_err(dev, "failed to add fgu disable action\n");
>  		return ret;
>  	}
> -- 
> 2.11.0
>
diff mbox series

Patch

diff --git a/drivers/power/supply/sc27xx_fuel_gauge.c b/drivers/power/supply/sc27xx_fuel_gauge.c
index 9c184d80088b..58b2970cd359 100644
--- a/drivers/power/supply/sc27xx_fuel_gauge.c
+++ b/drivers/power/supply/sc27xx_fuel_gauge.c
@@ -1023,9 +1023,8 @@  static int sc27xx_fgu_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	ret = devm_add_action(dev, sc27xx_fgu_disable, data);
+	ret = devm_add_action_or_reset(dev, sc27xx_fgu_disable, data);
 	if (ret) {
-		sc27xx_fgu_disable(data);
 		dev_err(dev, "failed to add fgu disable action\n");
 		return ret;
 	}