[PATCH 01/18] Input: zforce_ts - use devm_add_action_or_reset()

Dmitry Torokhov posted 18 patches 1 year, 3 months ago
[PATCH 01/18] Input: zforce_ts - use devm_add_action_or_reset()
Posted by Dmitry Torokhov 1 year, 3 months ago
From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>

If devm_add_action() fails we are explicitly calling the cleanup to free
the resources allocated. Lets use the helper devm_add_action_or_reset()
and return directly in case of error, as we know that the cleanup
function has been already called by the helper if there was any error.

Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/touchscreen/zforce_ts.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
index fdf2d1e770c8..ffbd55c6e1d4 100644
--- a/drivers/input/touchscreen/zforce_ts.c
+++ b/drivers/input/touchscreen/zforce_ts.c
@@ -803,15 +803,12 @@ static int zforce_probe(struct i2c_client *client)
 		udelay(100);
 	}
 
-	ret = devm_add_action(&client->dev, zforce_reset, ts);
+	ret = devm_add_action_or_reset(&client->dev, zforce_reset, ts);
 	if (ret) {
 		dev_err(&client->dev, "failed to register reset action, %d\n",
 			ret);
 
 		/* hereafter the regulator will be disabled by the action */
-		if (!IS_ERR(ts->reg_vdd))
-			regulator_disable(ts->reg_vdd);
-
 		return ret;
 	}
 
-- 
2.46.0.295.g3b9ea8a38a-goog
Re: [PATCH 01/18] Input: zforce_ts - use devm_add_action_or_reset()
Posted by Heiko Stübner 1 year, 3 months ago
Am Samstag, 24. August 2024, 07:50:25 CEST schrieb Dmitry Torokhov:
> From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
> 
> If devm_add_action() fails we are explicitly calling the cleanup to free
> the resources allocated. Lets use the helper devm_add_action_or_reset()
> and return directly in case of error, as we know that the cleanup
> function has been already called by the helper if there was any error.
> 
> Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>

mistmatch between From and first Signed-off-by

Other than that:
Reviewed-by: Heiko Stuebner <heiko@sntech.de>

> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
>  drivers/input/touchscreen/zforce_ts.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
> index fdf2d1e770c8..ffbd55c6e1d4 100644
> --- a/drivers/input/touchscreen/zforce_ts.c
> +++ b/drivers/input/touchscreen/zforce_ts.c
> @@ -803,15 +803,12 @@ static int zforce_probe(struct i2c_client *client)
>  		udelay(100);
>  	}
>  
> -	ret = devm_add_action(&client->dev, zforce_reset, ts);
> +	ret = devm_add_action_or_reset(&client->dev, zforce_reset, ts);
>  	if (ret) {
>  		dev_err(&client->dev, "failed to register reset action, %d\n",
>  			ret);
>  
>  		/* hereafter the regulator will be disabled by the action */
> -		if (!IS_ERR(ts->reg_vdd))
> -			regulator_disable(ts->reg_vdd);
> -
>  		return ret;
>  	}
>  
>
Re: [PATCH 01/18] Input: zforce_ts - use devm_add_action_or_reset()
Posted by Dmitry Torokhov 1 year, 3 months ago
On Sat, Aug 24, 2024 at 01:13:28PM +0200, Heiko Stübner wrote:
> Am Samstag, 24. August 2024, 07:50:25 CEST schrieb Dmitry Torokhov:
> > From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
> > 
> > If devm_add_action() fails we are explicitly calling the cleanup to free
> > the resources allocated. Lets use the helper devm_add_action_or_reset()
> > and return directly in case of error, as we know that the cleanup
> > function has been already called by the helper if there was any error.
> > 
> > Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
> 
> mistmatch between From and first Signed-off-by

Yeah, I got this patch a while ago...

> 
> Other than that:
> Reviewed-by: Heiko Stuebner <heiko@sntech.de>

Is this for this patch only or for the whole series?

> 
> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> > ---
> >  drivers/input/touchscreen/zforce_ts.c | 5 +----
> >  1 file changed, 1 insertion(+), 4 deletions(-)
> > 
> > diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
> > index fdf2d1e770c8..ffbd55c6e1d4 100644
> > --- a/drivers/input/touchscreen/zforce_ts.c
> > +++ b/drivers/input/touchscreen/zforce_ts.c
> > @@ -803,15 +803,12 @@ static int zforce_probe(struct i2c_client *client)
> >  		udelay(100);
> >  	}
> >  
> > -	ret = devm_add_action(&client->dev, zforce_reset, ts);
> > +	ret = devm_add_action_or_reset(&client->dev, zforce_reset, ts);
> >  	if (ret) {
> >  		dev_err(&client->dev, "failed to register reset action, %d\n",
> >  			ret);
> >  
> >  		/* hereafter the regulator will be disabled by the action */
> > -		if (!IS_ERR(ts->reg_vdd))
> > -			regulator_disable(ts->reg_vdd);
> > -
> >  		return ret;
> >  	}
> >  
> > 
> 
> 
> 
> 

Thanks.

-- 
Dmitry